[Koha-cvs] CVS: koha/C4/Circulation Returns.pm,1.2,1.3

[Andrew Arensburger]

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

Modified Files:
	Returns.pm 
Log Message:
Merged with arensb-context branch: use C4::Context->dbh instead of
&C4Connect, and generally prefer C4::Context over C4::Database.


Index: Returns.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Returns.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Returns.pm	14 Aug 2002 18:12:52 -0000	1.2
--- Returns.pm	5 Oct 2002 09:55:09 -0000	1.3
***************
*** 25,32 ****
  require Exporter;
  use DBI;
! use C4::Database;
  use C4::Accounts;
  use C4::InterfaceCDK;
  use C4::Circulation::Main;
  use C4::Format;
  use C4::Scan;
--- 25,34 ----
  require Exporter;
  use DBI;
! use C4::Context;
  use C4::Accounts;
  use C4::InterfaceCDK;
  use C4::Circulation::Main;
+ 	# FIXME - C4::Circulation::Main and C4::Circulation::Returns
+ 	# use each other, so functions get redefined.
  use C4::Format;
  use C4::Scan;
***************
*** 79,83 ****
  sub Returns {
    my ($env)=@_;
!   my $dbh=&C4Connect;  
    my @items;
    @items[0]=" "x50;
--- 81,85 ----
  sub Returns {
    my ($env)=@_;
!   my $dbh = C4::Context->dbh;  
    my @items;
    @items[0]=" "x50;
***************
*** 132,136 ****
    }
  #  clearscreen;
-   $dbh->disconnect;
    return($reason);
    }
--- 134,137 ----