[Koha-cvs] koha/barcodes label-print-pdf-demco-142-1685c.pl [dev_week]

[Mason James]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Mason James <sushi>	07/09/03 23:03:12

Modified files:
	barcodes       : label-print-pdf-demco-142-1685c.pl 

Log message:
	draw_text_block_manual2 rename

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-print-pdf-demco-142-1685c.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2

Patches:
Index: label-print-pdf-demco-142-1685c.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/Attic/label-print-pdf-demco-142-1685c.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- label-print-pdf-demco-142-1685c.pl	28 Aug 2007 23:04:24 -0000	1.1.2.1
+++ label-print-pdf-demco-142-1685c.pl	3 Sep 2007 23:03:11 -0000	1.1.2.2
@@ -12,7 +12,7 @@
 use PDF::Reuse::Barcode;
 use POSIX;
 
-use Smart::Comments;
+#use Smart::Comments '#####';
 
 my $htdocs_path = C4::Context->config('intrahtdocs');
 my $cgi         = new CGI;
@@ -25,6 +25,8 @@
 my $conf_data = get_label_options();
 
 my $batch_id    = $cgi->param('batch_id');
+##### $batch_id;
+
 my @resultsloop = get_label_items($batch_id);
 
 my $barcodetype  = $conf_data->{'barcodetype'};
@@ -153,14 +155,14 @@
     #    warn "$x_pos, $y_pos, $label_width, $label_height";
     my $barcode = $item->{'barcode'};
 
-#    drawbox( $x_pos, $y_pos, $block_width, $block_height, ) if $guidebox;
+    #    drawbox( $x_pos, $y_pos, $block_width, $block_height, ) if $guidebox;
 
     #-- spine
     drawbox( $x_pos, $y_pos + ( $block_height - $spine_height ),
         $spine_width, $spine_height, )
       if $guidebox;
 
-    draw_text_block_manual2(    # spine
+    draw_text_block_manual(    # spine
         $x_pos, $y_pos + ( $block_height - $spine_height ), $spine_width,
         $spine_height, $fontsize, '', $gutter, 'l',
         @spine_fields
@@ -174,22 +176,22 @@
         $y_pos + $label_height,
         $label_width, $label_height,
     ) if $guidebox;
-    draw_text_block_manual2(
+    draw_text_block_manual(
         ( $x_pos + $spine_width + $colspace ),
         ( $y_pos + $label_height ),
         $label_width, $label_height, $fontsize, '', $gutter, 'r', @circ_barcode
     );
 
-    draw_text_block_manual2(
+    draw_text_block_manual(
         ( $x_pos + $spine_width + $colspace ),
         ( $y_pos + $label_height ),
         $label_width, $label_height, $fontsize, '', $gutter,, '', @circ_fields
     );
 
-    draw_text_block_manual2(
+    draw_text_block_manual(
         ( $x_pos + $spine_width + $colspace + $spine_width ),
         ( $y_pos + $label_height ),
-        ($label_width - $spine_width),
+        ( $label_width - $spine_width ),
         $label_height,
         $fontsize,
         2,
@@ -204,18 +206,21 @@
     drawbox( ( $x_pos + $spine_width + $colspace ),
         $y_pos, $label_width, $label_height, )
       if $guidebox;
-    draw_text_block_manual2( ( $x_pos + $spine_width + $colspace ),
+    draw_text_block_manual( ( $x_pos + $spine_width + $colspace ),
         $y_pos, $label_width, $label_height, $fontsize, '', $gutter, 'r',
         @circ_barcode );
 
-    draw_text_block_manual2( ( $x_pos + $spine_width + $colspace ),
+    draw_text_block_manual( ( $x_pos + $spine_width + $colspace ),
         $y_pos, $label_width, $label_height, $fontsize, '', $gutter,, '',
         @circ_fields );
 
-    draw_text_block_manual2(
-        ( $x_pos + $spine_width + $colspace + $spine_width ),
-        $y_pos,   ($label_width - $spine_width),  $label_height, $fontsize, 2, $gutter, 'l',
-        @circ2_fields );
+    draw_text_block_manual(
+        ( $x_pos + $spine_width + $colspace + $spine_width ), $y_pos,
+        ( $label_width - $spine_width ),                      $label_height,
+        $fontsize,                                            2,
+        $gutter,                                              'l',
+        @circ2_fields
+    );
 
     #-- bottom barc