X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=labels%2Flabel-create-pdf.pl;h=edff024bc199917c2b5c14412125bd8d97a7d824;hb=ea61baa8d1c1c76c2a705aaaafdee66733e06854;hp=6d32c6cfc8e14db79a3bded4d8c9a46d0247b8aa;hpb=1ee7f449be2ba45c2458d2ac571172ecf58752b2;p=koha_ffzg

diff --git a/labels/label-create-pdf.pl b/labels/label-create-pdf.pl
index 6d32c6cfc8..edff024bc1 100755
--- a/labels/label-create-pdf.pl
+++ b/labels/label-create-pdf.pl
@@ -4,28 +4,27 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 
-use strict;
-use warnings;
+use Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Debug;
-use C4::Creators 1.000000;
-use C4::Labels 1.000000;
+use C4::Creators;
+use C4::Labels;
 
 my $cgi = new CGI;
 
@@ -45,8 +44,8 @@ $batch_id    = $cgi->param('batch_id') if $cgi->param('batch_id');
 my $template_id = $cgi->param('template_id') || undef;
 my $layout_id   = $cgi->param('layout_id') || undef;
 my $start_label = $cgi->param('start_label') || 1;
-@label_ids   = $cgi->param('label_id') if $cgi->param('label_id');
-@item_numbers  = $cgi->param('item_number') if $cgi->param('item_number');
+@label_ids   = $cgi->multi_param('label_id') if $cgi->param('label_id');
+@item_numbers  = $cgi->multi_param('item_number') if $cgi->param('item_number');
 
 my $items = undef;
 
@@ -58,9 +57,9 @@ print $cgi->header( -type       => 'application/pdf',
                     -attachment => "$pdf_file.pdf",
                   );
 
-my $pdf = C4::Creators::PDF->new(InitVars => 0);
+our $pdf = C4::Creators::PDF->new(InitVars => 0);
 my $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id);
-my $template = C4::Labels::Template->retrieve(template_id => $template_id, profile_id => 1);
+our $template = C4::Labels::Template->retrieve(template_id => $template_id, profile_id => 1);
 my $layout = C4::Labels::Layout->retrieve(layout_id => $layout_id);
 
 sub _calc_next_label_pos {
@@ -88,9 +87,9 @@ sub _calc_next_label_pos {
 sub _print_text {
     my $label_text = shift;
     foreach my $text_line (@$label_text) {
-        my $pdf_font = $pdf->Font($text_line->{'font'});
-        my $line = "BT /$pdf_font $text_line->{'font_size'} Tf $text_line->{'text_llx'} $text_line->{'text_lly'} Td ($text_line->{'line'}) Tj ET";
-        $pdf->Add($line);
+        $pdf->Font($text_line->{'font'});
+        $pdf->FontSize( $text_line->{'font_size'} );
+        $pdf->Text( $text_line->{'text_llx'}, $text_line->{'text_lly'}, $text_line->{'line'} );
     }
 }
 
@@ -139,6 +138,7 @@ foreach my $item (@{$items}) {
                                         barcode_type        => $layout->get_attr('barcode_type'),
                                         printing_type       => 'BIB',
                                         guidebox            => $layout->get_attr('guidebox'),
+                                        oblique_title       => $layout->get_attr('oblique_title'),
                                         font                => $layout->get_attr('font'),
                                         font_size           => $layout->get_attr('font_size'),
                                         callnum_split       => $layout->get_attr('callnum_split'),
@@ -162,6 +162,7 @@ foreach my $item (@{$items}) {
                                         barcode_type        => $layout->get_attr('barcode_type'),
                                         printing_type       => 'BAR',
                                         guidebox            => $layout->get_attr('guidebox'),
+                                        oblique_title       => $layout->get_attr('oblique_title'),
                                         font                => $layout->get_attr('font'),
                                         font_size           => $layout->get_attr('font_size'),
                                         callnum_split       => $layout->get_attr('callnum_split'),
@@ -188,6 +189,7 @@ foreach my $item (@{$items}) {
                                         barcode_type        => $layout->get_attr('barcode_type'),
                                         printing_type       => $layout->get_attr('printing_type'),
                                         guidebox            => $layout->get_attr('guidebox'),
+                                        oblique_title       => $layout->get_attr('oblique_title'),
                                         font                => $layout->get_attr('font'),
                                         font_size           => $layout->get_attr('font_size'),
                                         callnum_split       => $layout->get_attr('callnum_split'),
@@ -204,7 +206,7 @@ foreach my $item (@{$items}) {
 
 $pdf->End();
 
-exit(1);
+__END__
 
 =head1 NAME