[Koha-cvs] CVS: koha/marc koha2marc,1.5,1.6

[Andrew Arensburger]

Update of /cvsroot/koha/koha/marc
In directory usw-pr-cvs1:/tmp/cvs-serv29639/marc

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


Index: koha2marc
===================================================================
RCS file: /cvsroot/koha/koha/marc/koha2marc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** koha2marc	20 Jun 2002 17:33:17 -0000	1.5
--- koha2marc	5 Oct 2002 10:10:50 -0000	1.6
***************
*** 8,12 ****
  system("mysql Koha -pkohapass < deletemarc");
  
! use C4::Database;
  use C4::Catalogue;
  use CGI;
--- 8,12 ----
  system("mysql Koha -pkohapass < deletemarc");
  
! use C4::Context;
  use C4::Catalogue;
  use CGI;
***************
*** 16,25 ****
  use C4::Biblio;
  use C4::Output;
! my $dbh=C4Connect;
  my $userid=$ENV{'REMOTE_USER'};
- 
- 
- my $dbh=C4Connect;
- 
  
  my $sth=$dbh->prepare("select * from biblio,biblioitems where biblio.biblionumber=biblioitems.biblionumber");
--- 16,21 ----
  use C4::Biblio;
  use C4::Output;
! my $dbh = C4::Context->dbh;
  my $userid=$ENV{'REMOTE_USER'};
  
  my $sth=$dbh->prepare("select * from biblio,biblioitems where biblio.biblionumber=biblioitems.biblionumber");