Fix handling of pref defaults (#3747, #3588)

[koha.git] / serials / routing-preview.pl

diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl
index 48dc3a1..9cac0aa 100755 (executable)
--- a/serials/routing-preview.pl
+++ b/serials/routing-preview.pl
@@ -7,16 +7,17 @@ use strict;
 use CGI;
 use C4::Koha;
 use C4::Auth;
-use C4::Date;
+use C4::Dates;
 use C4::Output;
 use C4::Acquisition;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Circulation;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use C4::Members;
 use C4::Biblio;
+use C4::Items;
 use C4::Serials;
+use URI::Escape;
 
 my $query = new CGI;
 my $subscriptionid = $query->param('subscriptionid');
@@ -44,12 +45,11 @@ my ($count,@serials) = GetSerials($subscriptionid);
 my ($template, $loggedinuser, $cookie);
 
 if($ok){
-    my $env;
     # get biblio information....
     my $biblio = $subs->{'biblionumber'};
     
     # get existing reserves .....
-    my ($count,$reserves) = FindReserves($biblio);
+    my ($count,$reserves) = GetReservesFromBiblionumber($biblio);
     my $totalcount = $count;
     foreach my $res (@$reserves) {
         if ($res->{'found'} eq 'W') {
@@ -63,16 +63,15 @@ if($ok){
     my $notes;
     my $title = $subs->{'bibliotitle'};
     for(my $i=0;$i<$routing;$i++){
-       my $sth = $dbh->prepare("SELECT * FROM reserves WHERE biblionumber = ? AND borrowernumber = ? 
-                                 AND cancellationdate is NULL AND (found <> 'F' or found is NULL)");
+       my $sth = $dbh->prepare("SELECT * FROM reserves WHERE biblionumber = ? AND borrowernumber = ?");
         $sth->execute($biblio,$routinglist[$i]->{'borrowernumber'});
         my $data = $sth->fetchrow_hashref;
 
 #       warn "$routinglist[$i]->{'borrowernumber'} is the same as $data->{'borrowernumber'}";
        if($routinglist[$i]->{'borrowernumber'} == $data->{'borrowernumber'}){
-           UpdateReserve($routinglist[$i]->{'ranking'},$biblio,$routinglist[$i]->{'borrowernumber'},$branch);
+           ModReserve($routinglist[$i]->{'ranking'},$biblio,$routinglist[$i]->{'borrowernumber'},$branch);
         } else {
-        CreateReserve(\$env,$branch,$routinglist[$i]->{'borrowernumber'},$biblio,$const,\@bibitems,$routinglist[$i]->{'ranking'},$notes,$title);
+        AddReserve($branch,$routinglist[$i]->{'borrowernumber'},$biblio,$const,\@bibitems,$routinglist[$i]->{'ranking'},'',$notes,$title);
        }
     }
     
@@ -101,8 +100,8 @@ if($ok){
 my @results;
 my $data;
 for(my $i=0;$i<$routing;$i++){
-    $data=borrdata('',$routinglist[$i]->{'borrowernumber'});
-    $data->{'location'}=$data->{'streetaddress'};
+    $data=GetMember($routinglist[$i]->{'borrowernumber'},'borrowernumber');
+    $data->{'location'}=$data->{'branchcode'};
     $data->{'name'}="$data->{'firstname'} $data->{'surname'}";
     $data->{'routingid'}=$routinglist[$i]->{'routingid'};
     $data->{'subscriptionid'}=$subscriptionid;
@@ -115,6 +114,7 @@ $routingnotes =~ s/\n/\<br \/\>/g;
 $template->param(
     title => $subs->{'bibliotitle'},
     issue => $issue,
+    issue_escaped => URI::Escape::uri_escape($issue),
     subscriptionid => $subscriptionid,
     memberloop => \@results,    
     routingnotes => $routingnotes,