[Koha-cvs] CVS: koha/C4 Database.pm,1.8,1.9

[Andrew Arensburger]

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

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


Index: Database.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Database.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Database.pm	2 Oct 2002 16:26:14 -0000	1.8
--- Database.pm	5 Oct 2002 09:51:00 -0000	1.9
***************
*** 21,24 ****
--- 21,33 ----
  # Suite 330, Boston, MA  02111-1307 USA
  
+ # NOTE:
+ # C4::Database::C4Connect has been superseded by C4::Context->dbh;
+ 
+ # FIXME
+ # If C4::Biblio::OLD_MAY_BE_DELETED_newcompletebiblioitem can, in
+ # fact, be deleted, then it should be. Then C4::Biblio::getoraddbiblio
+ # won't be used anywhere, and it can be deleted too. That'll make two
+ # fewer functions that use C4::Database::requireDBI.
+ 
  use strict;
  require Exporter;
***************
*** 30,55 ****
  @ISA = qw(Exporter);
  @EXPORT = qw(
! 	&C4Connect &requireDBI &configfile
  );
- 
- sub configfile {
-     my $configfile;
-     open (KC, "/etc/koha.conf");
-     while (<KC>) {
- 	chomp;
- 	(next) if (/^\s*#/);
- 	if (/(.*)\s*=\s*(.*)/) {
- 	    my $variable=$1;
- 	    my $value=$2;
- 	    # Clean up white space at beginning and end
- 	    $variable=~s/^\s*//g;
- 	    $variable=~s/\s*$//g;
- 	    $value=~s/^\s*//g;
- 	    $value=~s/\s*$//g;
- 	    $configfile->{$variable}=$value;
- 	}
-     }
-     return $configfile;
- }
  
  sub C4Connect  {
--- 39,44 ----
  @ISA = qw(Exporter);
  @EXPORT = qw(
! 	&C4Connect &requireDBI
  );
  
  sub C4Connect  {