[Koha-cvs] CVS: koha/C4 Circulation.pm,1.7,1.8

[Andrew Arensburger]

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

Modified Files:
        Circulation.pm 
Log Message:
Deleted unused variables.
Removed trailing whitespace.


Index: Circulation.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Circulation.pm      13 Oct 2002 06:03:03 -0000      1.7
--- Circulation.pm      13 Oct 2002 08:29:47 -0000      1.8
***************
*** 3,7 ****
  # $Id$
  
! #package to deal with circulation 
  
  
--- 3,7 ----
  # $Id$
  
! #package to deal with circulation
  
  
***************
*** 37,44 ****
  
  use vars qw($VERSION @ISA @EXPORT);
!   
  # set the version for version checking
  $VERSION = 0.01;
!     
  @ISA = qw(Exporter);
  @EXPORT = qw(&Start_circ &scanborrower);
--- 37,44 ----
  
  use vars qw($VERSION @ISA @EXPORT);
! 
  # set the version for version checking
  $VERSION = 0.01;
! 
  @ISA = qw(Exporter);
  @EXPORT = qw(&Start_circ &scanborrower);
***************
*** 54,59 ****
    while ($donext ne 'Quit') {
      if ($donext  eq "Circ") {
!       clearscreen();        
!       ($reason,$data) = menu($env,'console','Circulation', 
          ('Issues','Returns','Borrower Enquiries','Reserves','Log In'));
        #debug_msg($env,"data = $data");
--- 54,59 ----
    while ($donext ne 'Quit') {
      if ($donext  eq "Circ") {
!       clearscreen();
!       ($reason,$data) = menu($env,'console','Circulation',
          ('Issues','Returns','Borrower Enquiries','Reserves','Log In'));
        #debug_msg($env,"data = $data");
***************
*** 61,65 ****
        $data = $donext;
      }
!     if ($data eq 'Issues') {  
        $donext=Issue($env); #C4::Circulation::Issues
        #debug_msg("","do next $donext");
--- 61,65 ----
        $data = $donext;
      }
!     if ($data eq 'Issues') {
        $donext=Issue($env); #C4::Circulation::Issues
        #debug_msg("","do next $donext");
***************
*** 74,83 ****
        &Login($env);   #C4::Security
        &startint($env,'Circulation');
!     } elsif ($data eq 'Quit') { 
        $donext = $data;
      }
      #debug_msg($env,"donext -  $donext");
    }
!   &endint($env)  
  }
  
--- 74,83 ----
        &Login($env);   #C4::Security
        &startint($env,'Circulation');
!     } elsif ($data eq 'Quit') {
        $donext = $data;
      }
      #debug_msg($env,"donext -  $donext");
    }
!   &endint($env)
  }
  
***************
*** 132,136 ****
    my ($env,$itemnum,$dbh,$bornum)address@hidden;
    my $sth=$dbh->prepare("Select 
firstname,surname,issues.borrowernumber,cardnumber,returndate
!   from issues,borrowers where 
    issues.itemnumber='$itemnum' and
    issues.borrowernumber=borrowers.borrowernumber and issues.returndate is
--- 132,136 ----
    my ($env,$itemnum,$dbh,$bornum)address@hidden;
    my $sth=$dbh->prepare("Select 
firstname,surname,issues.borrowernumber,cardnumber,returndate
!   from issues,borrowers where
    issues.itemnumber='$itemnum' and
    issues.borrowernumber=borrowers.borrowernumber and issues.returndate is
***************
*** 146,153 ****
        if ($resp == "y") {
          &renewbook($env,$dbh,$bornum,$itemnum);
!       }        
!       
      } else {
!       my $text="Issued to $borrower->{'firstname'} $borrower->{'surname'} 
($borrower->{'cardnumber'})";    
        my $resp = &msg_yn($text,"Mark as returned?");
        if ($resp == "y") {
--- 146,153 ----
        if ($resp == "y") {
          &renewbook($env,$dbh,$bornum,$itemnum);
!       }
! 
      } else {
!       my $text="Issued to $borrower->{'firstname'} $borrower->{'surname'} 
($borrower->{'cardnumber'})";
        my $resp = &msg_yn($text,"Mark as returned?");
        if ($resp == "y") {
***************
*** 156,162 ****
        } else {
          # can't issue
!       }       
      }
!   } 
    return($borrower->{'borrowernumber'});
    $sth->finish;
--- 156,162 ----
        } else {
          # can't issue
!       }
      }
!   }
    return($borrower->{'borrowernumber'});
    $sth->finish;
***************
*** 165,173 ****
  
  sub checkreserve{
!   # Check for reserves for biblio 
    # does not look at constraints yet
    my ($env,$dbh,$itemnum)address@hidden;
    my $resbor = "";
!   my $query = "select * from reserves,items 
    where (items.itemnumber = '$itemnum')
    and (items.biblionumber = reserves.biblionumber)
--- 165,173 ----
  
  sub checkreserve{
!   # Check for reserves for biblio
    # does not look at constraints yet
    my ($env,$dbh,$itemnum)address@hidden;
    my $resbor = "";
!   my $query = "select * from reserves,items
    where (items.itemnumber = '$itemnum')
    and (items.biblionumber = reserves.biblionumber)
***************
*** 176,180 ****
    $sth->execute();
    if (my $data=$sth->fetchrow_hashref) {
!     $resbor = $data->{'borrowernumber'}; 
    }
    return ($resbor);
--- 176,180 ----
    $sth->execute();
    if (my $data=$sth->fetchrow_hashref) {
!     $resbor = $data->{'borrowernumber'};
    }
    return ($resbor);
***************
*** 192,196 ****
    $sth->execute();
    if (my $data=$sth->fetchrow_hashref) {
!     push @itemswaiting,$data->{'itemnumber'}; 
    }
    return (address@hidden);
--- 192,196 ----
    $sth->execute();
    if (my $data=$sth->fetchrow_hashref) {
!     push @itemswaiting,$data->{'itemnumber'};
    }
    return (address@hidden);