bug 2473: correct display of items.content

[koha_fer] / labels / label-print-pdf.pl

diff --git a/labels/label-print-pdf.pl b/labels/label-print-pdf.pl
index 68a6b7f..7d54a6f 100755 (executable)
--- a/labels/label-print-pdf.pl
+++ b/labels/label-print-pdf.pl
@@ -6,10 +6,13 @@ use C4::Labels;
 use C4::Auth;
 use C4::Output;
 use C4::Context;
+use C4::Members;
+use C4::Branch;
 use HTML::Template::Pro;
 use PDF::Reuse;
 use PDF::Reuse::Barcode;
 use POSIX;
+use Data::Dumper;
 #use Smart::Comments;
 
 my $DEBUG = 0;
@@ -29,10 +32,11 @@ my $conf_data   = get_label_options();
 my $profile     = GetAssociatedProfile($template->{'tmpl_id'});
 
 my $batch_id =   $cgi->param('batch_id');
-my @resultsloop = get_label_items($batch_id);
+my @resultsloop;
 
 #$DB::single = 1;
 
+my $batch_type   = $conf_data->{'type'};
 my $barcodetype  = $conf_data->{'barcodetype'};
 my $printingtype = $conf_data->{'printingtype'};
 my $guidebox     = $conf_data->{'guidebox'};
@@ -41,11 +45,16 @@ if ($cgi->param('startlabel')) {
         $start_label = $cgi->param('startlabel');       # A bit of a hack to allow setting the starting label from the address bar... -fbcit
     }
 warn "Starting on label #$start_label" if $DEBUG;
-my $fontsize     = $template->{'fontsize'};
 my $units        = $template->{'units'};
 
-warn "UNITS $units";
-warn "fontsize = $fontsize";
+if ($printingtype eq 'PATCRD') {
+    @resultsloop = GetPatronCardItems($batch_id);
+} else {
+    @resultsloop = GetLabelItems($batch_id);
+}
+
+#warn "UNITS $units";
+#warn "fontsize = $fontsize";
 #warn Dumper $template;
 
 my $unitvalue = GetUnitsValue($units);
@@ -88,10 +97,10 @@ prFile();
 #   Courier-Oblique, Courier-BoldOblique, Helvetica, Helvetica-Bold, Helvetica-Oblique, Helvetica-BoldOblique
 # They can be abbreviated: TR, TB, TI, TBI, C, CB, CO, CBO, H, HB, HO, HBO
 
-my $fontname = $template->{'font'};
-my $font = prFont( $fontname );
+my $fontsize    = $template->{'fontsize'};
+my $fontname    = $template->{'font'};
 
-my $text_wrap_cols = GetTextWrapCols( $font, $fontsize, $label_width, $left_text_margin );
+my $text_wrap_cols = GetTextWrapCols( $fontname, $fontsize, $label_width, $left_text_margin );
 
 #warn $label_cols, $label_rows;
 
@@ -196,10 +205,9 @@ else {
 
 foreach $item (@resultsloop) {
     warn "Label parameters: xpos=$x_pos, ypos=$y_pos, lblwid=$label_width, lblhig=$label_height" if $DEBUG;
-    my $barcode = $item->{'barcode'};
     if ( $printingtype eq 'BAR' ) {
         drawbox( $x_pos, $y_pos, $label_width, $label_height ) if $guidebox;
-        DrawBarcode( $x_pos, $y_pos, $label_height, $label_width, $barcode,
+        DrawBarcode( $x_pos, $y_pos, $label_height, $label_width, $item->{'barcode'},
             $barcodetype );
         CalcNextLabelPos();
     }
@@ -212,9 +220,9 @@ foreach $item (@resultsloop) {
         my $barcode_y      = $y_pos + ( $label_height / 2.5  );   ## scaling voodoo
 
         DrawBarcode( $x_pos, $barcode_y, $barcode_height, $label_width,
-            $barcode, $barcodetype );
-        DrawSpineText( $y_pos, $text_height, $label_width, $font, $fontsize, $x_pos,
-            $left_text_margin, $text_wrap_cols, \$item, \$conf_data );
+            $item->{'barcode'}, $barcodetype );
+        DrawSpineText( $x_pos, $y_pos, $label_height, $label_width, $fontname, $fontsize,
+            $left_text_margin, $text_wrap_cols, \$item, \$conf_data, $printingtype, '1' );
 
         CalcNextLabelPos();
 
@@ -222,22 +230,22 @@ foreach $item (@resultsloop) {
     elsif ( $printingtype eq 'BIBBAR' ) {
         drawbox( $x_pos, $y_pos, $label_width, $label_height ) if $guidebox;
         my $barcode_height = $label_height / 2;
-        DrawBarcode( $x_pos, $y_pos, $barcode_height, $label_width, $barcode,
+        DrawBarcode( $x_pos, $y_pos, $barcode_height, $label_width, $item->{'barcode'},
             $barcodetype );
-        DrawSpineText( $y_pos, $label_height, $label_width, $font, $fontsize, $x_pos,
-            $left_text_margin, $text_wrap_cols, \$item, \$conf_data );
+        DrawSpineText( $x_pos, $y_pos, $label_height, $label_width, $fontname, $fontsize,
+            $left_text_margin, $text_wrap_cols, \$item, \$conf_data, $printingtype, '1' );
 
         CalcNextLabelPos();
     }
 
     elsif ( $printingtype eq 'ALT' ) {
         drawbox( $x_pos, $y_pos, $label_width, $label_height ) if $guidebox;
-        DrawBarcode( $x_pos, $y_pos, $label_height, $label_width, $barcode,
+        DrawBarcode( $x_pos, $y_pos, $label_height, $label_width, $item->{'barcode'},
             $barcodetype );
         CalcNextLabelPos();
         drawbox( $x_pos, $y_pos, $label_width, $label_height ) if $guidebox;
-        DrawSpineText( $y_pos, $label_height, $label_width, $font, $fontsize, $x_pos,
-            $left_text_margin, $text_wrap_cols, \$item, \$conf_data );
+        DrawSpineText( $x_pos, $y_pos, $label_height, $label_width, $fontname, $fontsize,
+            $left_text_margin, $text_wrap_cols, \$item, \$conf_data, $printingtype, '1' );
 
         CalcNextLabelPos();
     }
@@ -245,8 +253,29 @@ foreach $item (@resultsloop) {
 
     elsif ( $printingtype eq 'BIB' ) {
         drawbox( $x_pos, $y_pos, $label_width, $label_height ) if $guidebox;
-        DrawSpineText( $y_pos, $label_height, $label_width, $font, $fontsize, $x_pos,
-            $left_text_margin, $text_wrap_cols, \$item, \$conf_data, $printingtype );
+        DrawSpineText( $x_pos, $y_pos, $label_height, $label_width, $fontname, $fontsize,
+            $left_text_margin, $text_wrap_cols, \$item, \$conf_data, $printingtype, '0' );
+        CalcNextLabelPos();
+    }
+
+    elsif ( $printingtype eq 'PATCRD' ) {
+        my $patron_data = $item;
+
+        #FIXME: This needs to be paramatized and passed in from the user...
+        #Each element of this hash is a separate line on the patron card. Keys are the text to print and the associated data is the point size.
+        my $text = {        
+            $patron_data->{'description'}  => $fontsize,
+            $patron_data->{'branchname'}   => ($fontsize + 3),
+        };
+
+        warn "Generating patron card for cardnumber $patron_data->{'cardnumber'}";
+
+        drawbox( $x_pos, $y_pos, $label_width, $label_height ) if $guidebox;
+        my $barcode_height = $label_height / 2.75; #FIXME: Scaling barcode height; this needs to be a user parameter.
+        DrawBarcode( $x_pos, $y_pos, $barcode_height, $label_width, $patron_data->{'cardnumber'},
+            $barcodetype );
+        DrawPatronCardText( $x_pos, $y_pos, $label_height, $label_width, $fontname, $fontsize,
+            $left_text_margin, $text_wrap_cols, $text, $printingtype );
         CalcNextLabelPos();
     }