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

[Mason James]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Mason James <sushi>	08/02/04 01:28:18

Modified files:
	C4             : Labels.pm 

Log message:
	$justify changed to $text_justify

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

Patches:
Index: Labels.pm
===================================================================
RCS file: /sources/koha/koha/C4/Labels.pm,v
retrieving revision 1.3.4.59
retrieving revision 1.3.4.60
diff -u -b -r1.3.4.59 -r1.3.4.60
--- Labels.pm	30 Jan 2008 23:37:33 -0000	1.3.4.59
+++ Labels.pm	4 Feb 2008 01:28:17 -0000	1.3.4.60
@@ -665,7 +665,7 @@
         $issn,        $itemtype,     $bcn,            $dcn,
         $classif,     $subclass,     $itemcallnumber, $author, 
         $ccode,       $tmpl_id,     $printingtype, $guidebox,  
-        $startlabel,  $callnum_split, $justify,   $layoutname
+        $startlabel,  $callnum_split, $text_justify,   $layoutname
     ) = @_;
 
 ### @_ 
@@ -681,7 +681,7 @@
                 issn, itemtype, barcode,   dewey, 
                 class, subclass, itemcallnumber, author, ccode,
                 printingtype,    guidebox, startlabel, 
-                callnum_split, justify,  layoutname, active )
+                callnum_split, text_justify,  layoutname, active )
                values ( ?, ?, ?, ?, ?, ?, ?, ?,  ?, ? ,?, ?,
                         ?, ?,?,?,?,?, ?, 1 )";
     my $sth2 = $dbh->prepare($query2);
@@ -689,7 +689,7 @@
             $barcodetype, $title, $subtitle, $isbn,
             $issn,        $itemtype, $bcn,   $dcn, 
             $classif,     $subclass, $itemcallnumber, $author, $ccode,
-            $printingtype,  $guidebox, $startlabel,    $callnum_split,               $justify, $layoutname
+            $printingtype,  $guidebox, $startlabel,    $callnum_split,               $text_justify, $layoutname
             );
     $sth2->finish;
 
@@ -703,7 +703,7 @@
         $issn,        $itemtype,   $bcn,            $dcn,
         $classif,     $subclass,   $itemcallnumber, $author,
         $ccode,       $tmpl_id,    $printingtype,   $guidebox,
-        $startlabel,  $callnum_split, $justify , $layoutname, $layout_id
+        $startlabel,  $callnum_split, $text_justify , $layoutname, $layout_id
     ) = @_;
 
 ### @_;
@@ -724,7 +724,7 @@
         $issn,        $itemtype,     $bcn,            $dcn,
         $classif,     $subclass,     $itemcallnumber, $author,
         $ccode,       $printingtype, $guidebox,       $startlabel,
-$callnum_split,  $justify,   $layoutname,  $layout_id
+$callnum_split,  $text_justify,   $layoutname,  $layout_id
     );
     $sth2->finish;
 
@@ -817,7 +817,7 @@
     my (
         $x_pos,        $y_pos,    $label_width,
         $label_height, $fontsize, $startrow,
-        $gutter,       $justify,  @fields,
+        $gutter,       $text_justify,  @fields,
     ) = @_;
 ### @_
 
@@ -866,7 +866,7 @@
         # then loop for each string line
         foreach my $str (@strings) {
 
-            if ( $justify eq 'R' ) {
+            if ( $text_justify eq 'R' ) {
                 my $strwidth = prStrWidth( $str, 'C', $fontsize );
 #### $strwidth
                 $hPos = $x_pos + $label_width - ( $gutter + $strwidth );