bug4966 - follow up to 4966 changes language from 'end' to 'finish'

[koha_gimpoz] / labels / label-create-xml.pl

diff --git a/labels/label-create-xml.pl b/labels/label-create-xml.pl
index 563c221..dd83f1d 100755 (executable)
--- a/labels/label-create-xml.pl
+++ b/labels/label-create-xml.pl
@@ -11,10 +11,6 @@ use C4::Debug;
 use C4::Creators 1.000000;
 use C4::Labels 1.000000;
 
-=head
-
-=cut
-
 my $cgi = new CGI;
 
 my $batch_id    = $cgi->param('batch_id') if $cgi->param('batch_id');
@@ -66,9 +62,10 @@ foreach my $item (@$items) {
                                     format_string       => $layout->get_attr('format_string'),
                                       );
     my $format_string = $layout->get_attr('format_string');
-    my @data_fields = split(/, /, $format_string);
+    my @data_fields = map { $_ eq 'callnumber' ? 'itemcallnumber' : $_ } # see bug 5653 
+                      split(/, /, $format_string);
     my $csv_data = $label->csv_data();
-    for (my $i = 0; $i < (scalar(@data_fields) - 1); $i++) {
+    for (my $i = 0; $i <= (scalar(@data_fields) - 1); $i++) {
         push(@{$xml_data->{'label'}[$item_count]->{$data_fields[$i]}}, $$csv_data[$i]);
     }
     $item_count++;
@@ -106,8 +103,8 @@ This file is part of Koha.
 Koha is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software
 Foundation; either version 2 of the License, or (at your option) any later version.
 
-You should have received a copy of the GNU General Public License along with Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-Suite 330, Boston, MA  02111-1307 USA
+You should have received a copy of the GNU General Public License along with Koha; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301 USA.
 
 =head1 DISCLAIMER OF WARRANTY