Problem with error message

[koha.git] / serials / routing.pl

diff --git a/serials/routing.pl b/serials/routing.pl
index 87a04dc..1b3da2d 100755 (executable)
--- a/serials/routing.pl
+++ b/serials/routing.pl
@@ -1,27 +1,53 @@
 #!/usr/bin/perl
 
-# Routing.pl script used to create a routing list for a serial subscription
-# In this instance it is in fact a setting up of a list of reserves for the item
-# where the hierarchical order can be changed on the fly and a routing list can be
-# printed out
+# 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.
+#
+# 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, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+
+=head1 Routing.pl
+
+script used to create a routing list for a serial subscription
+In this instance it is in fact a setting up of a list of reserves for the item
+where the hierarchical order can be changed on the fly and a routing list can be
+printed out
+
+=cut
+
 use strict;
+use warnings;
 use CGI;
 use C4::Koha;
 use C4::Auth;
-use C4::Date;
+use C4::Dates;
+use C4::Output;
 use C4::Acquisition;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Context;
-use C4::Search;
+
+use C4::Members;
 use C4::Serials;
 
+use URI::Escape;
+
 my $query = new CGI;
 my $subscriptionid = $query->param('subscriptionid');
 my $serialseq = $query->param('serialseq');
 my $routingid = $query->param('routingid');
-my $bornum = $query->param('bornum');
+my $borrowernumber = $query->param('borrowernumber');
 my $notes = $query->param('notes');
-my $op = $query->param('op');
+my $op = $query->param('op') || q{};
 my $date_selected = $query->param('date_selected');
 my $dbh = C4::Context->dbh;
 
@@ -30,17 +56,18 @@ if($op eq 'delete'){
 }
 
 if($op eq 'add'){
-    addroutingmember($bornum,$subscriptionid);
+    addroutingmember($borrowernumber,$subscriptionid);
 }
 if($op eq 'save'){
     my $sth = $dbh->prepare("UPDATE serial SET routingnotes = ? WHERE subscriptionid = ?");
     $sth->execute($notes,$subscriptionid);
-    print $query->redirect("routing-preview.pl?subscriptionid=$subscriptionid&issue=$date_selected");
+    my $urldate = URI::Escape::uri_escape($date_selected);
+    print $query->redirect("routing-preview.pl?subscriptionid=$subscriptionid&issue=$urldate");
 }
-    
+
 my ($routing, @routinglist) = getroutinglist($subscriptionid);
 my $subs = GetSubscription($subscriptionid);
-my ($count,@serials) = old_getserials($subscriptionid);
+my ($count,@serials) = GetSerials($subscriptionid);
 my ($serialdates) = GetLatestSerials($subscriptionid,$count);
 
 my @dates;
@@ -62,7 +89,7 @@ my ($template, $loggedinuser, $cookie)
                                query => $query,
                                type => "intranet",
                                authnotrequired => 0,
-                               flagsrequired => {catalogue => 1},
+                               flagsrequired => {serials => 'routing'},
                                debug => 1,
                                });
 # my $date;
@@ -78,42 +105,54 @@ my ($template, $loggedinuser, $cookie)
 # }
 
 # my $issue = "$serialseq ($date)";
-  
+
 my @results;
 my $data;
 for(my $i=0;$i<$routing;$i++){
-    $data=borrdata('',$routinglist[$i]->{'borrowernumber'});
-    $data->{'location'}=$data->{'streetaddress'};
-    $data->{'name'}="$data->{'firstname'} $data->{'surname'}";
+    $data=GetMember($routinglist[$i]->{'borrowernumber'},'borrowernumber');
+    $data->{'location'}=$data->{'branchcode'};
+    if ($data->{firstname} ) {
+        $data->{name} = $data->{firstname} . q| |;
+    }
+    else {
+        $data->{name} = q{};
+    }
+    if ($data->{surname} ) {
+        $data->{name} .= $data->{surname};
+    }
     $data->{'routingid'}=$routinglist[$i]->{'routingid'};
     $data->{'subscriptionid'}=$subscriptionid;
-    my $rankingbox = '<select name="itemrank" onchange="reorder_item('.$subscriptionid.','.$routinglist[$i]->{'routingid'}.',this.options[this.selectedIndex].value)">';
+    if (! $routinglist[$i]->{routingid} ) {
+        $routinglist[$i]->{routingid} = q||;
+    }
+    my $rankingbox = '<select name="itemrank" onchange="reorder_item('
+    . $subscriptionid . ',' .$routinglist[$i]->{'routingid'} . ',this.options[this.selectedIndex].value)">';
     for(my $j=1; $j <= $routing; $j++) {
        $rankingbox .= "<option ";
-       if($routinglist[$i]->{'ranking'} == $j){
-           $rankingbox .= " selected='SELECTED'";
+       if($routinglist[$i]->{ranking} && $routinglist[$i]->{ranking} == $j){
+           $rankingbox .= " selected=\"selected\"";
        }
-       $rankingbox .= " value='$j'>$j</option>";
+       $rankingbox .= " value=\"$j\">$j</option>";
     }
     $rankingbox .= "</select>";
     $data->{'routingbox'} = $rankingbox;
-    
+
     push(@results, $data);
 }
-# warn Dumper(@results);
+
 # for adding routing list
 my $new;
 if ($op eq 'new') {
     $new = 1;
 } else {
 # for modify routing list default
-    $new => 0;
+    $new = 0;
 }
 
 $template->param(
     title => $subs->{'bibliotitle'},
     subscriptionid => $subscriptionid,
-    memberloop => \@results,    
+    memberloop => \@results,
     op => $new,
     dates => \@dates,
     routingnotes => $serials[0]->{'routingnotes'},