X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=labels%2Flabel-create-xml.pl;h=d0369db465961dd0ce2dbb50bbd93ff4a2def24a;hb=46c4aa3551f810e8d1853f5013a282ce4ee95541;hp=563c22182ebb2631203ba9f08dff55ac4bcafc73;hpb=84d5b28f12c038309e8d3891653ea6fd291b666e;p=srvgit

diff --git a/labels/label-create-xml.pl b/labels/label-create-xml.pl
index 563c22182e..d0369db465 100755
--- a/labels/label-create-xml.pl
+++ b/labels/label-create-xml.pl
@@ -1,27 +1,43 @@
 #!/usr/bin/perl
 
-use strict;
-use warnings;
-
-use CGI;
+# Copyright Koha development team 2011
+#
+# 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 3 of the License, or
+# (at your option) any later version.
+#
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+#
+
+use Modern::Perl;
+
+use CGI qw ( -utf8 );
 use XML::Simple;
 use Data::Dumper;
 
 use C4::Debug;
-use C4::Creators 1.000000;
-use C4::Labels 1.000000;
-
-=head
-
-=cut
+use C4::Creators;
+use C4::Labels;
 
 my $cgi = new CGI;
 
-my $batch_id    = $cgi->param('batch_id') if $cgi->param('batch_id');
+my $batch_id;
+my @label_ids;
+my @item_numbers;
+$batch_id    = $cgi->param('batch_id') if $cgi->param('batch_id');
 my $template_id = $cgi->param('template_id') || undef;
 my $layout_id   = $cgi->param('layout_id') || undef;
-my @label_ids   = $cgi->param('label_id') if $cgi->param('label_id');
-my @item_numbers  = $cgi->param('item_number') if $cgi->param('item_number');
+@label_ids   = $cgi->multi_param('label_id') if $cgi->param('label_id');
+@item_numbers  = $cgi->multi_param('item_number') if $cgi->param('item_number');
 
 my $items = undef;
 
@@ -57,7 +73,6 @@ my $xml_data = {'label' => []};
 
 my $item_count = 0;
 
-XML_ITEMS:
 foreach my $item (@$items) {
     push(@{$xml_data->{'label'}}, {'item_number' => $item->{'item_number'}});
     my $label = C4::Labels::Label->new(
@@ -66,9 +81,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++;
@@ -80,7 +96,7 @@ my $xml_out = $xml->XMLout($xml_data);
 #die "XML OUT:\n" . Dumper($xml_out);
 print $xml_out;
 
-exit(1);
+__END__
 
 =head1 NAME
 
@@ -106,11 +122,12 @@ 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
 
 Koha is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
+=cut