# Suite 330, Boston, MA 02111-1307 USA
use strict;
-#use DBI;
-use C4::Search;
+use warnings;
use C4::Biblio;
+use C4::Items;
use CGI;
use C4::Output;
-use C4::Reserves2;
-use C4::Circulation::Circ2;
+use C4::Reserves;
+use C4::Circulation;
use C4::Members;
my $input = new CGI;
#print $input->header;
my @bibitems=$input->param('biblioitem');
-my @reqbib=$input->param('reqbib');
-my $biblio=$input->param('biblio');
+# 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 $borrower=$input->param('member');
my $notes=$input->param('notes');
my $branch=$input->param('pickup');
my @rank=$input->param('rank-request');
my $type=$input->param('type');
my $title=$input->param('title');
-my $bornum=borrdata($borrower,'');
+my $borrowernumber=GetMember($borrower,'cardnumber');
my $checkitem=$input->param('checkitem');
-# my $priority;
my $found;
-#new op : 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 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 ''){
- $rank[0] = '0';
- my %env;
- my $item = $checkitem;
- $item = getiteminformation(\%env,$item);
- if ( $item->{'holdingbranch'} eq $branch ){
- $found = 'W';
- }
-
-
+ $rank[0] = '0' unless C4::Context->preference('ReservesNeedReturns');
+ my $item = $checkitem;
+ $item = GetItem($item);
+ if ( $item->{'holdingbranch'} eq $branch ){
+ $found = 'W' unless C4::Context->preference('ReservesNeedReturns');
+ }
}
-# END of new op .
-
-if ($type eq 'str8' && $bornum ne ''){
+if ($type eq 'str8' && $borrowernumber ne ''){
my $count=@bibitems;
@bibitems=sort @bibitems;
my $i2=1;
$i2++;
}
}
- my $env;
my $const;
if ($input->param('request') eq 'any'){
- $const='a';
- CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblio,$const,\@realbi,$rank[0],$notes,$title,$checkitem,$found);
+ # place a request on 1st available
+ AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$notes,$title,$checkitem,$found);
} elsif ($reqbib[0] ne ''){
- $const='o';
- CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblio,$const,\@reqbib,$rank[0],$notes,$title,$checkitem, $found);
+ # FIXME : elsif probably never reached, (see top of the script)
+ # place a request on a given item
+ AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$notes,$title,$checkitem, $found);
} else {
- CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblio,'a',\@realbi,$rank[0],$notes,$title,$checkitem, $found);
+ AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$notes,$title,$checkitem, $found);
}
-print $input->redirect("request.pl?bib=$biblio");
-} elsif ($bornum eq ''){
+print $input->redirect("request.pl?biblionumber=$biblionumber");
+} elsif ($borrowernumber eq ''){
print $input->header();
print "Invalid card number please try again";
print $input->Dump;