[Koha-cvs] CVS: koha/acqui.simple processz3950queue,1.5,1.6

[Andrew Arensburger]

Update of /cvsroot/koha/koha/acqui.simple
In directory usw-pr-cvs1:/tmp/cvs-serv24364/acqui.simple

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


Index: processz3950queue
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/processz3950queue,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** processz3950queue	2 Jul 2002 22:08:50 -0000	1.5
--- processz3950queue	5 Oct 2002 09:56:32 -0000	1.6
***************
*** 1,4 ****
  #!/usr/bin/perl
! use C4::Database;
  use DBI;
  #use strict;
--- 1,4 ----
  #!/usr/bin/perl
! use C4::Context;
  use DBI;
  #use strict;
***************
*** 27,31 ****
      
  
! my $dbh=C4Connect;
  
  my $sth=$dbh->prepare("update z3950results set active=0");
--- 27,31 ----
      
  
! my $dbh = C4::Context->dbh;
  
  my $sth=$dbh->prepare("update z3950results set active=0");
***************
*** 100,104 ****
  			    #$sti->finish;
  			    #$dbh->disconnect;
! 			    my $dbi=C4Connect;
  			    my ($name, $server, $database, $user, $password) = split(/\//, $serverinfo, 5);
  			    $server=~/(.*)\:(\d+)/;
--- 100,104 ----
  			    #$sti->finish;
  			    #$dbh->disconnect;
! 			    my $dbi = C4::Context->dbh;
  			    my ($name, $server, $database, $user, $password) = split(/\//, $serverinfo, 5);
  			    $server=~/(.*)\:(\d+)/;
***************
*** 212,219 ****
  				}
  			    }
  			    my $stj=$dbi->prepare("update z3950results set active=0 where id=$resultsid");
  			    $stj->execute;
  			    eval {$stj->finish};
- 			    $dbi->disconnect;
  			    print "    $server done.\n";
  			    exit;
--- 212,219 ----
  				}
  			    }
+ 			    # FIXME - There's already a $stj in this scope
  			    my $stj=$dbi->prepare("update z3950results set active=0 where id=$resultsid");
  			    $stj->execute;
  			    eval {$stj->finish};
  			    print "    $server done.\n";
  			    exit;