[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/10/21 22:46:49

Modified files:
        C4             : Labels.pm 

Log message:
        better lccn split regex

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

Patches:
Index: Labels.pm
===================================================================
RCS file: /sources/koha/koha/C4/Labels.pm,v
retrieving revision 1.3.4.50
retrieving revision 1.3.4.51
diff -u -b -r1.3.4.50 -r1.3.4.51
--- Labels.pm   21 Oct 2007 00:15:01 -0000      1.3.4.50
+++ Labels.pm   21 Oct 2007 22:46:49 -0000      1.3.4.51
@@ -118,16 +118,15 @@
     $_ = $lccn;
 
     my @splits   = m/([a-zA-Z]+)
-        ([0-9]+)
-        (\.[0-9]+)
+        ([0-9]+\.[0-9]+)
         (\s)
         (\.[a-zA-Z0-9]+)
         (\s)
         ([0-9]+)
         /x;
 
+    splice (@splits, 2,1); 
     splice (@splits, 3,1); 
-    splice (@splits, 4,1); 
 
     return @splits;
 }
@@ -804,6 +803,7 @@
         $label_height, $fontsize, $startrow,
         $gutter,       $justify,  @fields,
     ) = @_;
+### @_
 
 ### @fields
     my $text_wrap_cols = GetTextWrapCols( $fontsize, $label_width );
@@ -850,7 +850,7 @@
         # then loop for each string line
         foreach my $str (@strings) {
 
-            if ( $justify eq 'r' ) {
+            if ( $justify eq 'R' ) {
                 my $strwidth = prStrWidth( $str, 'C', $fontsize );
 #### $strwidth
                 $hPos = $x_pos + $label_width - ( $gutter + $strwidth );