[Koha-devel] CVS: koha/C4 Search.pm,1.14,1.15 Reserves2.pm,1.3,1.4

[Chris Cormack]

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv14561/C4

Modified Files:
	Search.pm Reserves2.pm 
Log Message:
Getting Iteminfo in Search to only display correct reserves (mainly used on
detail.pl) and another typo fix in moremember.pl



Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Search.pm	20 Feb 2002 21:05:19 -0000	1.14
--- Search.pm	13 Mar 2002 03:26:43 -0000	1.15
***************
*** 908,912 ****
      }
      if ($datedue eq ''){
!        my ($rescount,$reserves)=FindReserves($biblionumber,'');   
         if ($rescount >0){                                
            $datedue='Request';
--- 908,913 ----
      }
      if ($datedue eq ''){
!        my ($rescount,$reserves)=Findgroupreserve($data->{'biblioitemnumber'},$biblionumber);
! 
         if ($rescount >0){                                
            $datedue='Request';

Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Reserves2.pm	13 Mar 2002 02:03:57 -0000	1.3
--- Reserves2.pm	13 Mar 2002 03:26:43 -0000	1.4
***************
*** 92,103 ****
  
  sub Findgroupreserve {
!   my ($bibitem)=@_;
    my $dbh=C4Connect;
    $bibitem=$dbh->quote($bibitem);
!   my $query="Select * from reserves,reserveconstraints where
!   reserves.biblionumber=reservesconstraints.biblionumber and
!   and reserveconstraints.biblioitemnumber=$bibitem
    and reserves.cancellationdate is NULL
    and (reserves.found <> 'F' or reserves.found is NULL)";
    my $sth=$dbh->prepare($query);
    $sth->execute;
--- 92,110 ----
  
  sub Findgroupreserve {
!   my ($bibitem,$biblio)=@_;
    my $dbh=C4Connect;
    $bibitem=$dbh->quote($bibitem);
!   my $query="Select * from reserves 
!   left join reserveconstraints on
!   reserves.biblionumber=reserveconstraints.biblionumber
!   where
!   reserves.biblionumber=$biblio and
!   ((reserveconstraints.biblioitemnumber=$bibitem 
!   and reserves.borrowernumber=reserveconstraints.borrowernumber
!   and reserves.reservedate=reserveconstraints.reservedate)
!   or reserves.constrainttype='a')
    and reserves.cancellationdate is NULL
    and (reserves.found <> 'F' or reserves.found is NULL)";
+ #  print $query;
    my $sth=$dbh->prepare($query);
    $sth->execute;