[Koha-cvs] CVS: koha/C4 Reserves2.pm,1.5.2.6,1.5.2.7

[Finlay Thompson]

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

Modified Files:
      Tag: rel-1-2
        Reserves2.pm 
Log Message:

bugg fixes



Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -C2 -r1.5.2.6 -r1.5.2.7
*** Reserves2.pm        14 Aug 2002 18:30:50 -0000      1.5.2.6
--- Reserves2.pm        11 Sep 2002 22:23:31 -0000      1.5.2.7
***************
*** 31,35 ****
--- 31,71 ----
      
  @ISA = qw(Exporter);
+ <<<<<<< Reserves2.pm
+ @EXPORT = qw(&FindReserves &CheckReserves &CheckWaiting &CancelReserve 
&FillReserve &ReserveWaiting &CreateReserve &updatereserves &Findgroupreserve);
+ %EXPORT_TAGS = ( );     # eg: TAG => [ qw!name1 name2! ],
+                 
+ # your exported package globals go here,
+ # as well as any optionally exported functions
+ 
+ @EXPORT_OK   = qw($Var1 %Hashit);
+ 
+ 
+ # non-exported package globals go here
+ use vars qw(@more $stuff);
+       
+ # initalize package globals, first exported ones
+ 
+ my $Var1   = '';
+ my %Hashit = ();
+                   
+ # then the others (which are still accessible as $Some::Module::stuff)
+ my $stuff  = '';
+ my @more   = ();
+       
+ # all file-scoped lexicals must be created before
+ # the functions below that use them.
+               
+ # file-private lexicals go here
+ my $priv_var    = '';
+ my %secret_hash = ();
+                           
+ # here's a file-private function as a closure,
+ # callable as &$priv_func;  it cannot be prototyped.
+ my $priv_func = sub {
+   # stuff goes here.
+ };
+ =======
  @EXPORT = qw(&FindReserves &CheckReserves &CheckWaiting &CancelReserve 
&FillReserve &ReserveWaiting &CreateReserve &updatereserves &getreservetitle 
&Findgroupreserve);
+ >>>>>>> 1.8
                                                    
  # make all your functions, whether exported or not;
***************
*** 70,75 ****
    my @results;
    while (my $data=$sth->fetchrow_hashref){
!     $results[$i]=$data;
!     $i++;
    }
  #  print $query;
--- 106,117 ----
    my @results;
    while (my $data=$sth->fetchrow_hashref){
!       if ($data->{'constrainttype'} eq "o") {
!         my $bibres = 
getreservetitle($data->{'biblionumber'},$data->{'borrowernumber'},$data->{'reservedate'},$data->{'timestamp'});
!         foreach my $key (keys %$bibres) {
!             $data->{$key} = $bibres->{$key};
!         }
!       }
!       $results[$i]=$data;
!       $i++;
    }
  #  print $query;
***************
*** 449,464 ****
    $sth->finish;                                       
    return($nextaccntno);                   
! }              
  
  sub updatereserves{
    #subroutine to update a reserve 
!   my ($rank,$biblio,$borrower,$del,$branch)address@hidden;
!   my $dbh=C4Connect;
!   my $query="Update reserves ";
!   if ($del ==0){
!     $query.="set  priority='$rank',branchcode='$branch' where
!     biblionumber=$biblio and borrowernumber=$borrower";
    } else {
!     $query="Select * from reserves where biblionumber=$biblio and
      borrowernumber=$borrower";
      my $sth=$dbh->prepare($query);
--- 491,506 ----
    $sth->finish;                                       
    return($nextaccntno);                   
! }     
  
  sub updatereserves{
    #subroutine to update a reserve 
!   my ($rank, $biblio, $borrower, $del, $branch)address@hidden;
!   my $dbh = C4Connect;
!   my $query = "UPDATE reserves ";
!   if ($del == 0) {
!     $query.="SET priority='$rank', branchcode='$branch' WHERE
!     biblionumber=$biblio AND borrowernumber=$borrower";
    } else {
!     $query="SELECT * FROM reserves WHERE biblionumber=$biblio AND
      borrowernumber=$borrower";
      my $sth=$dbh->prepare($query);
***************
*** 466,471 ****
      my $data=$sth->fetchrow_hashref;
      $sth->finish;
!     $query="Select * from reserves where biblionumber=$biblio and 
!     priority > '$data->{'priority'}' and cancellationdate is NULL 
      order by priority";
      my $sth2=$dbh->prepare($query) || die $dbh->errstr;
--- 508,513 ----
      my $data=$sth->fetchrow_hashref;
      $sth->finish;
!     $query="SELECT * FROM reserves WHERE biblionumber=$biblio AND 
!     priority > '$data->{'priority'}' AND cancellationdate is NULL 
      order by priority";
      my $sth2=$dbh->prepare($query) || die $dbh->errstr;
***************
*** 491,508 ****
  
  sub getreservetitle {
!  my ($biblio,$bor,$date,$timestamp)address@hidden;
!  my $dbh=C4Connect;
!  my $query="Select * from reserveconstraints,biblioitems where
!  reserveconstraints.biblioitemnumber=biblioitems.biblioitemnumber
!  and reserveconstraints.biblionumber=$biblio and 
reserveconstraints.borrowernumber
!  = $bor and reserveconstraints.reservedate='$date' and
!  reserveconstraints.timestamp=$timestamp";
!  my $sth=$dbh->prepare($query);
!  $sth->execute;
!  my $data=$sth->fetchrow_hashref;
!  $sth->finish;
!  $dbh->disconnect;
  # print $query;
!  return($data);
  }
  
--- 533,553 ----
  
  sub getreservetitle {
!     my ($biblio,$bor,$date,$timestamp)address@hidden;
!     my $dbh=C4Connect;
!     my $query = "SELECT biblioitems.volumeddesc AS volumeddesc,
!                         biblioitems.itemtype AS itemtype 
!                    FROM reserveconstraints,biblioitems 
!                   WHERE reserveconstraints.biblioitemnumber = 
biblioitems.biblioitemnumber
!                     AND reserveconstraints.biblionumber     = $biblio 
!                     AND reserveconstraints.borrowernumber   = $bor 
!                     AND reserveconstraints.reservedate      = '$date' 
!                     AND reserveconstraints.timestamp        = $timestamp";
!     my $sth=$dbh->prepare($query);
!     $sth->execute;
!     my $data=$sth->fetchrow_hashref;
!     $sth->finish;
!     $dbh->disconnect;
  # print $query;
!     return($data);
  }