[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.21,1.21.2.1 Renewals2.pm,1.2,1.2.2.1

[Chris Cormack]

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

Modified Files:
      Tag: rel-1-2
        Circ2.pm Renewals2.pm 
Log Message:
Fixing up a whole pile of warnings


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -r1.21 -r1.21.2.1
*** Circ2.pm    13 Mar 2002 21:13:42 -0000      1.21
--- Circ2.pm    18 May 2002 10:21:51 -0000      1.21.2.1
***************
*** 396,400 ****
            # check for overdue fine
  
!           $overduecharge;
            $sth=$dbh->prepare("select * from accountlines where 
(borrowernumber=$borrower->{'borrowernumber'}) and (itemnumber = 
$iteminformation->{'itemnumber'}) and (accounttype='FU' or accounttype='O')");
            $sth->execute;
--- 396,400 ----
            # check for overdue fine
  
! 
            $sth=$dbh->prepare("select * from accountlines where 
(borrowernumber=$borrower->{'borrowernumber'}) and (itemnumber = 
$iteminformation->{'itemnumber'}) and (accounttype='FU' or accounttype='O')");
            $sth->execute;
***************
*** 472,476 ****
                    values
                    
($data->{'borrowernumber'},$accdata->{'accountno'},$nextaccntno,$newamtos)";
!                   my $usth = $dbh->prepare($updquery);
                    $usth->execute;
                    $usth->finish;
--- 472,476 ----
                    values
                    
($data->{'borrowernumber'},$accdata->{'accountno'},$nextaccntno,$newamtos)";
!                   $usth = $dbh->prepare($updquery);
                    $usth->execute;
                    $usth->finish;
***************
*** 730,734 ****
    my $cnt=0;
    if (my $data=$sth->fetchrow_hashref) {
!     @itemswaiting[$cnt] =$data;
      $cnt ++
    }
--- 730,734 ----
    my $cnt=0;
    if (my $data=$sth->fetchrow_hashref) {
!     $itemswaiting[$cnt] =$data;
      $cnt ++
    }
***************
*** 821,825 ****
    }
    my @date = split("-",$datedue);
!   my $odatedue = (@date[2]+0)."-".(@date[1]+0)."-"address@hidden;
    my $issquery = "select * from issues where borrowernumber='$bornum' and
      itemnumber='$itemno' and returndate is null";
--- 821,825 ----
    }
    my @date = split("-",$datedue);
!   my $odatedue = ($date[2]+0)."-".($date[1]+0)."-".$date[0];
    my $issquery = "select * from issues where borrowernumber='$bornum' and
      itemnumber='$itemno' and returndate is null";
***************
*** 833,837 ****
      where borrowernumber='$bornum' and
      itemnumber='$itemno' and returndate is null";
!   my $sth=$dbh->prepare($updquery);
    
    $sth->execute;
--- 833,837 ----
      where borrowernumber='$bornum' and
      itemnumber='$itemno' and returndate is null";
!   $sth=$dbh->prepare($updquery);
    
    $sth->execute;
***************
*** 862,866 ****
            $charge = ($charge *(100 - $discount)) / 100;
        }
!       $sth2->{'finish'};
      }      
      $sth1->finish;
--- 862,866 ----
            $charge = ($charge *(100 - $discount)) / 100;
        }
!       $sth2->finish;
      }      
      $sth1->finish;

Index: Renewals2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Renewals2.pm,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** Renewals2.pm        9 May 2001 00:05:57 -0000       1.2
--- Renewals2.pm        18 May 2002 10:21:51 -0000      1.2.2.1
***************
*** 15,18 ****
--- 15,19 ----
  use C4::Accounts2;
  use C4::Circulation::Circ2;
+ use warnings;
  
  use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
***************
*** 129,133 ****
      where borrowernumber='$bornum' and
      itemnumber='$itemno' and returndate is null";
!   my $sth=$dbh->prepare($updquery);
    $sth->execute;
    $sth->finish;
--- 130,134 ----
      where borrowernumber='$bornum' and
      itemnumber='$itemno' and returndate is null";
!   $sth=$dbh->prepare($updquery);
    $sth->execute;
    $sth->finish;
***************
*** 179,183 ****
        $charge = ($charge *(100 - $discount)) / 100;                 
      }                         
!     $sth2->{'finish'};                              
    }                                   
    $sth1->finish;  
--- 180,184 ----
        $charge = ($charge *(100 - $discount)) / 100;                 
      }                         
!     $sth2->finish;                              
    }                                   
    $sth1->finish;