[Koha-cvs] koha/C4 Labels.pm [dev_week]

[Mason James]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Mason James <sushi>	07/08/27 22:47:05

Modified files:
	C4             : Labels.pm 

Log message:
	draw_text_block_manual2() takes startrow position

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Labels.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.3.4.43&r2=1.3.4.44

Patches:
Index: Labels.pm
===================================================================
RCS file: /sources/koha/koha/C4/Labels.pm,v
retrieving revision 1.3.4.43
retrieving revision 1.3.4.44
diff -u -b -r1.3.4.43 -r1.3.4.44
--- Labels.pm	27 Aug 2007 10:45:06 -0000	1.3.4.43
+++ Labels.pm	27 Aug 2007 22:47:04 -0000	1.3.4.44
@@ -772,10 +772,14 @@
 
     my (
         $x_pos,    $y_pos,  $label_width,  $label_height,
-        $fontsize, $gutter,  $text_wrap_cols,
-          $no_wrap, $justify,  @fields,
+        $fontsize, $startrow, $gutter,  $justify,  @fields,
     ) = @_;
 
+
+#### @fields
+my $text_wrap_cols  = GetTextWrapCols( $fontsize, $label_width );
+
+
     # hack to fix column name mismatch betwen labels_conf.class,
     # and bibitems.classification
 
@@ -791,13 +795,16 @@
 
     # add your printable fields manually in here
 
-#### @fields
     # warn Dumper $conf_data;
     #warn Dumper $item;
 
     my $vPos = ( $y_pos + ( $label_height - $top_text_margin ) );
+$vPos = $vPos - ($line_spacer * --$startrow) if $startrow > 0;
+
+
     my $hPos = ( $x_pos + $gutter );
 
+#### @fields
 
     foreach my $field (@fields) {
 
@@ -822,7 +829,6 @@
         # split the chunks between newline's, into an array
         my @strings = split /\n/, $str;
 
-$justify = 'r';
 
         # then loop for each string line
         foreach my $str (@strings) {