Context.pm - file size test (-s) is subset of file exists test (-e), so testing both...

[koha_fer] / circ / waitingreserves.pl

diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index 028f82d..7d805b8 100755 (executable)
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-# $Id$
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -20,15 +19,16 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use CGI;
 use C4::Context;
 use C4::Output;
-use CGI;
 use C4::Branch; # GetBranchName
 use C4::Auth;
-use C4::Date;
+use C4::Dates qw/format_date/;
 use C4::Circulation;
 use C4::Members;
 use C4::Biblio;
+use C4::Items;
 
 use Date::Calc qw(
   Today
@@ -37,7 +37,6 @@ use Date::Calc qw(
 );
 use C4::Reserves;
 use C4::Koha;
-use C4::Interface::CGI::Output;
 
 my $input = new CGI;
 
@@ -74,7 +73,7 @@ if ($item) {
     my $messages;
     my $nextreservinfo;
     my $waiting;
-    ( $messages, $nextreservinfo ) = GlobalCancel( $item, $borrowernumber );
+    ( $messages, $nextreservinfo ) = ModReserveCancelAll( $item, $borrowernumber );
 
     #          if we have a result
     if ($nextreservinfo) {
@@ -104,14 +103,22 @@ if ($item) {
 
 #              if the document is not in his homebranch location and there is not reservation after, we transfer it
     if ( ( $fbr ne $tbr ) and ( not $nextreservinfo ) ) {
-        dotransfer( $item, $fbr, $tbr );
+        ModItemTransfer( $item, $fbr, $tbr );
     }
 }
 
 my @reservloop;
 
-my @getreserves = GetReservesForBranch($default);
-
+my @getreserves;
+if (C4::Context->preference('IndependantBranches')){
+       # get reserves for the branch we are logged into
+       @getreserves = GetReservesForBranch($default);
+}
+else {
+       # get all reserves waiting
+       @getreserves = GetReservesForBranch();
+}      
+       
 foreach my $num (@getreserves) {
     my %getreserv;
     my $gettitle     = GetBiblioFromItemNumber( $num->{'itemnumber'} );
@@ -119,7 +126,7 @@ foreach my $num (@getreserves) {
     my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );
     $getreserv{'waitingdate'} = format_date( $num->{'waitingdate'} );
 
-    next unless $num->{'waitingdate'} ne '0000-00-00';
+    next unless ($num->{'waitingdate'} && $num->{'waitingdate'} ne '0000-00-00');
     my ( $waiting_year, $waiting_month, $waiting_day ) = split /-/,
       $num->{'waitingdate'};
     ( $waiting_year, $waiting_month, $waiting_day ) =