Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv23201/C4 Modified Files: Reserves2.pm Log Message: Fixing reserve handling. Mulitple copy reserves now handled correctly, and correct charges are being applied Index: Reserves2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Reserves2.pm 2000/12/19 23:45:55 1.1.1.1 --- Reserves2.pm 2001/11/25 20:17:53 1.2 *************** *** 55,59 **** my ($bib,$bor)=@_; my $dbh=C4Connect; ! my $query="Select *,reserves.branchcode from reserves,borrowers,biblio "; if ($bib ne ''){ --- 55,59 ---- my ($bib,$bor)=@_; my $dbh=C4Connect; ! my $query="Select *,reserves.branchcode,biblio.title as btitle from reserves,borrowers,biblio "; if ($bib ne ''){ *************** *** 176,181 **** $x++; } ! if ($const eq 'o') {if ($found == 1) {push @biblioitems,$data;} ! } else {if ($found == 0) {push @biblioitems,$data;} } } } --- 176,188 ---- $x++; } ! if ($const eq 'o') { ! if ( $found == 1) { ! push @biblioitems,$data1; ! } ! } else { ! if ($found == 0) { ! push @biblioitems,$data1; ! } ! } } } *************** *** 194,202 **** my $query3 = "select * from issues where itemnumber = '$itdata->{'itemnumber'}' and ! returndate is null"; my $sth3 = $dbh->prepare($query3); $sth3->execute(); ! if (my $isdata=$sth3->fetchrow_hashref) { } else ! {$allissued = 0; } } $x++; --- 201,212 ---- my $query3 = "select * from issues where itemnumber = '$itdata->{'itemnumber'}' and ! returndate is null"; ! my $sth3 = $dbh->prepare($query3); $sth3->execute(); ! if (my $isdata=$sth3->fetchrow_hashref) { ! } else { ! $allissued = 0; ! } } $x++; *************** *** 207,211 **** my $rsth = $dbh->prepare($rquery); $rsth->execute(); ! if (my $rdata = $rsth->fetchrow_hashref) { } else { $fee = 0; } --- 217,222 ---- my $rsth = $dbh->prepare($rquery); $rsth->execute(); ! if (my $rdata = $rsth->fetchrow_hashref) { ! } else { $fee = 0; }