[Koha-cvs] CVS: koha/z3950 processz3950queue,1.11,1.12

[Paul POULAIN]

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15438/z3950

Modified Files:
        processz3950queue 
Log Message:
sync'ing with rel_2_0

Index: processz3950queue
===================================================================
RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** processz3950queue   11 Feb 2004 08:44:28 -0000      1.11
--- processz3950queue   24 Mar 2004 15:09:25 -0000      1.12
***************
*** 105,109 ****
      $<=$uid;
  }
! my $dbh = C4::Context->dbh;
  
  # we begin the script, so "unactive" every pending request : they will never 
give anything, the script died :-(
--- 105,114 ----
      $<=$uid;
  }
! my $db_driver = $context->{"config"}{"db_scheme"} || "mysql";
! my $db_name   = $context->{"config"}{"database"};
! my $db_host   = $context->{"config"}{"hostname"};
! my $db_user   = $context->{"config"}{"user"};
! my $db_passwd = $context->{"config"}{"pass"};
! my $dbh = DBI->connect("DBI:$db_driver:$db_name:$db_host",$db_user, 
$db_passwd);
  
  # we begin the script, so "unactive" every pending request : they will never 
give anything, the script died :-(
***************
*** 180,184 ****
  # and connect to z3950 server
  #FIXME: why do we need $dbi ? can't we use $dbh ?
!                                                       my $dbi = 
C4::Context->dbh;
                                                        my ($name, $server, 
$database, $user, $password,$syntax) = split(/\//, $serverinfo, 6);
                                                        $globalname=$name;
--- 185,194 ----
  # and connect to z3950 server
  #FIXME: why do we need $dbi ? can't we use $dbh ?
!                                                       my $db_driver = 
$context->{"config"}{"db_scheme"} || "mysql";
!                                                       my $db_name   = 
$context->{"config"}{"database"};
!                                                       my $db_host   = 
$context->{"config"}{"hostname"};
!                                                       my $db_user   = 
$context->{"config"}{"user"};
!                                                       my $db_passwd = 
$context->{"config"}{"pass"};
!                                                       my $dbi = 
DBI->connect("DBI:$db_driver:$db_name:$db_host",$db_user, $db_passwd);
                                                        my ($name, $server, 
$database, $user, $password,$syntax) = split(/\//, $serverinfo, 6);
                                                        $globalname=$name;