Bug 11944: use CGI( -utf8 ) everywhere

[srvgit] / serials / routing-preview.pl

diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl
index 437c852..db0984c 100755 (executable)
--- a/serials/routing-preview.pl
+++ b/serials/routing-preview.pl
@@ -20,7 +20,7 @@
 # of reserves for the serial
 use strict;
 use warnings;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Koha;
 use C4::Auth;
 use C4::Dates;
@@ -71,8 +71,9 @@ if($ok){
 
        if (C4::Context->preference('RoutingListAddReserves')){
                # get existing reserves .....
-               my ($count,$reserves) = GetReservesFromBiblionumber($biblio);
-               my $totalcount = $count;
+        my $reserves = GetReservesFromBiblionumber({ biblionumber => $biblio });
+        my $count = scalar( @$reserves );
+        my $totalcount = $count;
                foreach my $res (@$reserves) {
                        if ($res->{'found'} eq 'W') {
                                $count--;
@@ -87,7 +88,12 @@ if($ok){
             my $reserve = $sth->fetchrow_hashref;
 
             if($routing->{borrowernumber} == $reserve->{borrowernumber}){
-                ModReserve($routing->{ranking},$biblio,$routing->{borrowernumber},$branch);
+                ModReserve({
+                    rank           => $routing->{ranking},
+                    biblionumber   => $biblio,
+                    borrowernumber => $routing->{borrowernumber},
+                    branchcode     => $branch
+                });
             } else {
                 AddReserve($branch,$routing->{borrowernumber},$biblio,$const,\@bibitems,$routing->{ranking}, undef, undef, $notes,$title);
         }
@@ -95,7 +101,7 @@ if($ok){
        }
 
     ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/routing-preview-slip.tmpl",
+= get_template_and_user({template_name => "serials/routing-preview-slip.tt",
                                query => $query,
                                type => "intranet",
                                authnotrequired => 0,
@@ -105,7 +111,7 @@ if($ok){
     $template->param("libraryname"=>$branchname);
 } else {
     ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/routing-preview.tmpl",
+= get_template_and_user({template_name => "serials/routing-preview.tt",
                                query => $query,
                                type => "intranet",
                                authnotrequired => 0,
@@ -127,7 +133,7 @@ $routingnotes =~ s/\n/\<br \/\>/g;
 $template->param(
     title => $subs->{'bibliotitle'},
     issue => $issue,
-    issue_escaped => URI::Escape::uri_escape($issue),
+    issue_escaped => URI::Escape::uri_escape_utf8($issue),
     subscriptionid => $subscriptionid,
     memberloop => $memberloop,
     routingnotes => $routingnotes,