X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=reserve%2Fplacerequest.pl;h=28e886898cffccea7b880c699845c27e9b4e342d;hb=6bb0b6b2d90402bf1c618f32ddfde83529e63ba8;hp=1499ea5007bdd429216277c90bff3829e5444ac5;hpb=e20270fec4f6d34f01050bea4c5765d5b3c4ed33;p=koha.git

diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl
index 1499ea5007..28e886898c 100755
--- a/reserve/placerequest.pl
+++ b/reserve/placerequest.pl
@@ -1,25 +1,25 @@
 #!/usr/bin/perl
 
 #script to place reserves/requests
-#writen 2/1/00 by chris@katipo.oc.nz
+#written 2/1/00 by chris@katipo.oc.nz
 
 
 # Copyright 2000-2002 Katipo Communications
 #
 # 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 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.
+# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
@@ -38,10 +38,6 @@ my $input = CGI->new();
 checkauth($input, 0, { reserveforothers => 'place_holds' }, 'intranet');
 
 my @bibitems=$input->param('biblioitem');
-# FIXME I think reqbib does not exist anymore, it's used in line 82, to AddReserve of contraint type 'o'
-#       I bet it's a 2.x feature, reserving a given biblioitem, that is useless in Koha 3.0
-#       we can remove this line, the AddReserve of constrainttype 'o',
-#       and probably remove the reserveconstraint table as well, I never could fill anything in this table.
 my @reqbib=$input->param('reqbib'); 
 my $biblionumber=$input->param('biblionumber');
 my $borrowernumber=$input->param('borrowernumber');
@@ -72,7 +68,7 @@ my $found;
 
 # if we have an item selectionned, and the pickup branch is the same as the holdingbranch
 # of the document, we force the value $rank and $found .
-if ($checkitem ne ''){
+if (defined $checkitem && $checkitem ne ''){
     $rank[0] = '0' unless C4::Context->preference('ReservesNeedReturns');
     my $item = $checkitem;
     $item = GetItem($item);
@@ -96,9 +92,8 @@ if ($type eq 'str8' && $borrower){
                 $i2++;
             }
         }
-        my $const;
 
-	if ($checkitem ne ''){
+    if (defined $checkitem && $checkitem ne ''){
 		my $item = GetItem($checkitem);
         	if ($item->{'biblionumber'} ne $biblionumber) {
                 	$biblionumber = $item->{'biblionumber'};
@@ -109,19 +104,11 @@ if ($type eq 'str8' && $borrower){
 
         if ($multi_hold) {
             my $bibinfo = $bibinfos{$biblionumber};
-            AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',[$biblionumber],
+            AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,[$biblionumber],
                        $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found);
         } else {
-            if ($input->param('request') eq 'any'){
-                # place a request on 1st available
-                AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found);
-            } elsif ($reqbib[0] ne ''){
-                # FIXME : elsif probably never reached, (see top of the script)
-                # place a request on a given item
-                AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);
-            } else {
-                AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);
-            }
+            # place a request on 1st available
+            AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found);
         }
     }