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

[Paul POULAIN]

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

Modified Files:
	Reserves2.pm 
Log Message:
Merge from 1.2 and main branches


Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Reserves2.pm	6 Jun 2002 02:47:53 -0000	1.7
--- Reserves2.pm	2 Jul 2002 15:46:42 -0000	1.8
***************
*** 1,6 ****
! package C4::Reserves2; #asummes C4/Reserves2
! 
! #requires DBI.pm to be installed
! #uses DBD:Pg
  
  use strict;
--- 1,3 ----
! package C4::Reserves2; #assumes C4/Reserves2
  
  use strict;
***************
*** 17,59 ****
  @ISA = qw(Exporter);
  @EXPORT = qw(&FindReserves &CheckReserves &CheckWaiting &CancelReserve &FillReserve &ReserveWaiting &CreateReserve &updatereserves &getreservetitle &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.
- };
  						    
  # make all your functions, whether exported or not;
  
  sub FindReserves {
!   my ($bib,$bor) = @_;
!   my $dbh = C4Connect;
!   my $query = "SELECT *,reserves.branchcode,biblio.title AS btitle
                        FROM reserves,borrowers,biblio ";
    if ($bib ne ''){
--- 14,24 ----
  @ISA = qw(Exporter);
  @EXPORT = qw(&FindReserves &CheckReserves &CheckWaiting &CancelReserve &FillReserve &ReserveWaiting &CreateReserve &updatereserves &getreservetitle &Findgroupreserve);
  						    
  # make all your functions, whether exported or not;
  
  sub FindReserves {
!   my ($bib,$bor)=@_;
!   my $dbh=C4Connect;
!   my $query="SELECT *,reserves.branchcode,biblio.title AS btitle
                        FROM reserves,borrowers,biblio ";
    if ($bib ne ''){
***************
*** 418,422 ****
      my $allissued = 1; 
      while ($x < $cntitemsfound) { 
!       my $bitdata = @biblioitems[$x];                                       
        my $query2 = "select * from items                   
        where biblioitemnumber = '$bitdata->{'biblioitemnumber'}'";     
--- 383,387 ----
      my $allissued = 1; 
      while ($x < $cntitemsfound) { 
!       my $bitdata = $biblioitems[$x];                                       
        my $query2 = "select * from items                   
        where biblioitemnumber = '$bitdata->{'biblioitemnumber'}'";