X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=labels%2Flabel-create-pdf.pl;h=edff024bc199917c2b5c14412125bd8d97a7d824;hb=aece4f62ea6c37b0dafa9584038571d0a2d49e43;hp=11087268af918435385c99ef69998c43f88a6425;hpb=f57ceeb8c56cfcae782db9802f5f6df8a2a1bc93;p=srvgit

diff --git a/labels/label-create-pdf.pl b/labels/label-create-pdf.pl
index 11087268af..edff024bc1 100755
--- a/labels/label-create-pdf.pl
+++ b/labels/label-create-pdf.pl
@@ -1,45 +1,76 @@
 #!/usr/bin/perl
 
-use strict;
-use warnings;
-
-use CGI;
-
+# Copyright Chris Nighswonger 2009
+#
+# 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 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+
+
+use Modern::Perl;
+
+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;
 
-my $batch_id    = $cgi->param('batch_id') if $cgi->param('batch_id');
+my ( undef, $loggedinuser, $cookie ) = get_template_and_user({
+								     template_name   => "labels/label-home.tt",
+								     query           => $cgi,
+								     type            => "intranet",
+								     authnotrequired => 0,
+								     flagsrequired   => { tools => 'label_creator' },
+								     debug           => 1,
+								     });
+
+my $batch_id;
+my @label_ids;
+my @item_numbers;
+$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;
-my @label_ids   = $cgi->param('label_id') if $cgi->param('label_id');
-my @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;
 
+
+
 my $pdf_file = (@label_ids || @item_numbers ? "label_single_" . scalar(@label_ids || @item_numbers) : "label_batch_$batch_id");
 print $cgi->header( -type       => 'application/pdf',
                     -encoding   => 'utf-8',
                     -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 {
     my ($row_count, $col_count, $llx, $lly) = @_;
-    if ($col_count lt $template->get_attr('cols')) {
+    if ($col_count < $template->get_attr('cols')) {
         $llx = ($llx + $template->get_attr('label_width') + $template->get_attr('col_gap'));
         $col_count++;
     }
     else {
         $llx = $template->get_attr('left_margin');
-        if ($row_count eq $template->get_attr('rows')) {
+        if ($row_count == $template->get_attr('rows')) {
             $pdf->Page();
             $lly = ($template->get_attr('page_height') - $template->get_attr('top_margin') - $template->get_attr('label_height'));
             $row_count = 1;
@@ -56,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'} );
     }
 }
 
@@ -107,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'),
@@ -130,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'),
@@ -156,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'),
@@ -172,7 +206,7 @@ foreach my $item (@{$items}) {
 
 $pdf->End();
 
-exit(1);
+__END__
 
 =head1 NAME