[Koha-cvs] CVS: koha/marc koha2marc,1.4.2.1,1.4.2.2

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
        koha2marc 
Log Message:
Merging from trunk to rel-1-2


Index: koha2marc
===================================================================
RCS file: /cvsroot/koha/koha/marc/koha2marc,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** koha2marc   14 Jun 2002 21:20:27 -0000      1.4.2.1
--- koha2marc   28 Oct 2002 19:56:04 -0000      1.4.2.2
***************
*** 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");