[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.21.2.4,1.21.2.5

[Chris Cormack]

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

Modified Files:
      Tag: rel-1-2
        Circ2.pm 
Log Message:
Merging branchtransfers and lots of circulation fixes into the rel-1-2 branch
Needs testing. 



Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.21.2.4
retrieving revision 1.21.2.5
diff -C2 -r1.21.2.4 -r1.21.2.5
*** Circ2.pm    14 Aug 2002 18:30:50 -0000      1.21.2.4
--- Circ2.pm    15 Aug 2002 00:46:26 -0000      1.21.2.5
***************
*** 23,26 ****
--- 23,27 ----
  
  use strict;
+ # use warnings;
  require Exporter;
  use DBI;
***************
*** 33,36 ****
--- 34,38 ----
  #use C4::Scan;
[...1274 lines suppressed...]
!               if (my $conrec = $consth->fetchrow_hashref) {
!                   if ($resrec->{'constrainttype'} eq "o") {
!                       $resfound = 1;
!                   }
!               }
!               $consth->finish;
!           }
!       }
!       if ($resfound) {
!             my $updquery = "update reserves set found = 'W', itemnumber = 
'$itemno'
!                   where borrowernumber = $brn and reservedate = $rdate and 
biblionumber = $bibno";
!           my $updsth = $dbh->prepare($updquery);
!           $updsth->execute;
!           $updsth->finish;
!       }
      }
!     $sth->finish;
!     return ($resfound,$lastrec);
  }