[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/07/17 21:45:14

Modified files:
        C4             : Labels.pm 

Log message:
        adding missing 'itemcallnumber' text field, and fixing barcode-types 
typo too

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

Patches:
Index: Labels.pm
===================================================================
RCS file: /sources/koha/koha/C4/Labels.pm,v
retrieving revision 1.3.4.31
retrieving revision 1.3.4.32
diff -u -b -r1.3.4.31 -r1.3.4.32
--- Labels.pm   16 Jul 2007 01:26:56 -0000      1.3.4.31
+++ Labels.pm   17 Jul 2007 21:45:13 -0000      1.3.4.32
@@ -190,7 +190,8 @@
 sub get_text_fields {
     my ($layout_id, $sorttype) = @_;
 
-    my ( $a, $b, $c, $d, $e, $f, $g, $h, $i );
+#FIXME: use pushes, this is lame :)
+    my ( $a, $b, $c, $d, $e, $f, $g, $h, $i, $j );
 
     my $sortorder = get_layout($layout_id);
 
@@ -229,7 +230,11 @@
       { code => 'author', desc => "Author", order => $sortorder->{'author'} };
     $i = { code => 'title', desc => "Title", order => $sortorder->{'title'} };
 
-    my @text_fields = ( $a, $b, $c, $d, $e, $f, $g, $h, $i );
+    $i = { code => 'itemcallnumber', desc => "Itemcallnumber", order => 
$sortorder->{'itemcallnumber'} };
+
+
+
+    my @text_fields = ( $a, $b, $c, $d, $e, $f, $g, $h, $i, $j );
 
     my @new_fields;
     foreach my $field (@text_fields) {
@@ -725,7 +730,7 @@
     my $guard_length = 10;
     my $xsize_ratio;
 
-    if ( $barcodetype eq 'Code39' ) {
+    if ( $barcodetype eq 'CODE39' ) {
         $bar_length = '17.5';
         $tot_bar_length =
           ( $bar_length * $num_of_bars ) + ( $guard_length * 2 );
@@ -745,7 +750,7 @@
         }
     }
 
-    elsif ( $barcodetype eq 'Code39sum' ) {
+    elsif ( $barcodetype eq 'CODE39MOD' ) {
 
         # get modulo43 checksum
         my $c39 = CheckDigits('code_39');
@@ -771,7 +776,7 @@
         }
     }
 
-    elsif ( $barcodetype eq 'COOP2of5' ) {
+    elsif ( $barcodetype eq 'COOP2OF5' ) {
         $bar_length = '9.43333333333333';
         $tot_bar_length =
           ( $bar_length * $num_of_bars ) + ( $guard_length * 2 );
@@ -790,7 +795,7 @@
         }
     }
 
-    elsif ( $barcodetype eq 'Industrial2of5' ) {
+    elsif ( $barcodetype eq 'INDUSTRIAL2OF5' ) {
         $bar_length = '13.1333333333333';
         $tot_bar_length =
           ( $bar_length * $num_of_bars ) + ( $guard_length * 2 );
@@ -811,9 +816,8 @@
 
     my $moo2 = $tot_bar_length * $xsize_ratio;
 
-    warn " $x_pos, $y_pos, $barcode, $barcodetype\n";
-    warn
-"BAR_WDTH = $bar_width, TOT.BAR.LGHT=$tot_bar_length  R*TOT.BAR =$moo2 \n";
+#    warn " $x_pos, $y_pos, $barcode, $barcodetype\n";
+ #   warn "BAR_WDTH = $bar_width, TOT.BAR.LGHT=$tot_bar_length  R*TOT.BAR 
=$moo2 \n";
 }
 
 =item build_circ_barcode;