[Koha-cvs] CVS: koha/C4 BookShelves.pm,1.6,1.7

[Andrew Arensburger]

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

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


Index: BookShelves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** BookShelves.pm      23 Sep 2002 13:50:30 -0000      1.6
--- BookShelves.pm      5 Oct 2002 09:50:10 -0000       1.7
***************
*** 27,31 ****
  require Exporter;
  use DBI;
! use C4::Database;
  use C4::Circulation::Circ2;
  use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
--- 27,31 ----
  require Exporter;
  use DBI;
! use C4::Context;
  use C4::Circulation::Circ2;
  use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
***************
*** 94,98 ****
  # make all your functions, whether exported or not;
  
! my $dbh=C4Connect();
  
  =item GetShelfList
--- 94,98 ----
  # make all your functions, whether exported or not;
  
! my $dbh = C4::Context->dbh;
  
  =item GetShelfList
***************
*** 281,284 ****
--- 281,292 ----
  #
  # $Log$
+ # Revision 1.7  2002/10/05 09:50:10  arensb
+ # Merged with arensb-context branch: use C4::Context->dbh instead of
+ # &C4Connect, and generally prefer C4::Context over C4::Database.
+ #
+ # Revision 1.6.2.1  2002/10/04 02:24:43  arensb
+ # Use C4::Connect instead of C4::Database, C4::Connect->dbh instead
+ # C4Connect.
+ #
  # Revision 1.6  2002/09/23 13:50:30  arensb
  # Fixed missing bit in POD.