[Koha-cvs] CVS: koha/z3950 processz3950queue,1.8,1.9

[MJ Ray]

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1:/tmp/cvs-serv27011

Modified Files:
	processz3950queue 
Log Message:
now uses placeholders in sql

Index: processz3950queue
===================================================================
RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** processz3950queue	6 Oct 2003 09:10:39 -0000	1.8
--- processz3950queue	6 Nov 2003 15:06:24 -0000	1.9
***************
*** 63,68 ****
  					my %serverdone;
  					unless ($stk->rows) {
! 						my $sti=$dbh->prepare("update z3950queue set done=-1,startdate=$now where id=$id");
! 						$sti->execute;
  					}
  					while (my ($r_id, $r_server,$r_startdate,$r_enddate,$r_numrecords,$active) = $stk->fetchrow) {
--- 63,68 ----
  					my %serverdone;
  					unless ($stk->rows) {
! 						my $sti=$dbh->prepare("update z3950queue set done=-1,startdate=$now where id=?");
! 						$sti->execute($id);
  					}
  					while (my ($r_id, $r_server,$r_startdate,$r_enddate,$r_numrecords,$active) = $stk->fetchrow) {
***************
*** 115,136 ****
  							my $resultsid;
  							if ($serverdone{$serverinfo}==-1) {
! 								my $stj=$dbi->prepare("select id from z3950results where server=$q_serverinfo and queryid=$id");
! 								$stj->execute;
  								($resultsid) = $stj->fetchrow;
  								$stj->finish;
  							} else {
! 								my $stj=$dbi->prepare("select id from z3950results where server=$q_serverinfo and queryid=$id");
! 								$stj->execute;
  								($resultsid) = $stj->fetchrow;
  								$stj->finish;
  								unless ($resultsid) {
! 									$stj=$dbi->prepare("insert into z3950results (server, queryid, startdate) values ($q_serverinfo, $id, $now)");
! 									$stj->execute;
  									$resultsid=$dbi->{'mysql_insertid'};
  									$stj->finish;
  								}
  							}
! 							my $stj=$dbh->prepare("update z3950results set active=1 where id=$resultsid");
! 							$stj->execute;
  							my $conn;
  							my $noconnection=0;
--- 115,136 ----
  							my $resultsid;
  							if ($serverdone{$serverinfo}==-1) {
! 								my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?");
! 								$stj->execute($q_serverinfo,$id);
  								($resultsid) = $stj->fetchrow;
  								$stj->finish;
  							} else {
! 								my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?");
! 								$stj->execute($q_serverinfo,$id);
  								($resultsid) = $stj->fetchrow;
  								$stj->finish;
  								unless ($resultsid) {
! 									$stj=$dbi->prepare("insert into z3950results (server, queryid, startdate) values (?,?,?)");
! 									$stj->execute($q_serverinfo, $id, $now);
  									$resultsid=$dbi->{'mysql_insertid'};
  									$stj->finish;
  								}
  							}
! 							my $stj=$dbh->prepare("update z3950results set active=1 where id=?");
! 							$stj->execute($resultsid);
  							my $conn;
  							my $noconnection=0;
***************
*** 204,220 ****
  									$now=time();
  									if ($numresults >0) {
! 										my $task="update z3950results set numrecords=$numresults,numdownloaded=$numrecords,highestseen=0,results=$q_result,enddate=$now where id=$resultsid";
! 										my $stj=$dbi->prepare($task);
! 										$stj->execute;
  									} else { # no results...
! 										my $task="update z3950results set numrecords=$numresults,numdownloaded=$numrecords,highestseen=0,results='',enddate=$now where id=$resultsid";
! 										my $stj=$dbi->prepare($task);
! 										$stj->execute;
  									}
  									my $counter=0;
  									while ($counter<60 && $numrecords<$numresults) {
  										$counter++;
! 										my $stj=$dbi->prepare("select highestseen from z3950results where id=$resultsid");
! 										$stj->execute;
  										my ($highestseen) = $stj->fetchrow;
  										if ($highestseen>($numrecords-30)) {
--- 204,218 ----
  									$now=time();
  									if ($numresults >0) {
! 										my $stj=$dbi->prepare("update z3950results set numrecords=?,numdownloaded=?,highestseen=0,results=?,enddate=? where id=?");
! 										$stj->execute($numresults,$numrecords,$q_result,$now,$resultsid);
  									} else { # no results...
! 										my $stj=$dbi->prepare("update z3950results set numrecords=?,numdownloaded=?,highestseen=0,results='',enddate=? where id=?");
! 										$stj->execute($numresults,$numrecords,$now,$resultsid);
  									}
  									my $counter=0;
  									while ($counter<60 && $numrecords<$numresults) {
  										$counter++;
! 										my $stj=$dbi->prepare("select highestseen from z3950results where id=?");
! 										$stj->execute($resultsid);
  										my ($highestseen) = $stj->fetchrow;
  										if ($highestseen>($numrecords-30)) {
***************
*** 238,244 ****
  											($q_result) || ($q_result='""');
  											$now=time();
! 											my $task="update z3950results set numdownloaded=$numrecords,results=$q_result where id=$resultsid";
! 											my $stj=$dbi->prepare($task);
! 											$stj->execute;
  										}
  										sleep 5;
--- 236,241 ----
  											($q_result) || ($q_result='""');
  											$now=time();
! 											my $stj=$dbi->prepare("update z3950results set numdownloaded=?,results=? where id=?");
! 											$stj->execute($numrecords,$q_result,$resultsid);
  										}
  										sleep 5;
***************
*** 247,252 ****
  							}
  							# 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";
--- 244,249 ----
  							}
  							# FIXME - There's already a $stj in this scope
! 							my $stj=$dbi->prepare("update z3950results set active=0 where id=?");
! 							$stj->execute($resultsid);
  							eval {$stj->finish};
  							print "    $server done.\n";
***************
*** 267,272 ****
  					}
  					unless ($stillprocessing) {
! 						#my $sti=$dbh->prepare("select enddate from z3950queue where id=$id");
! 						#$sti->execute;
  						#my ($enddate) = $sti->fetchrow;
  						#unless ($enddate) {
--- 264,269 ----
  					}
  					unless ($stillprocessing) {
! 						#my $sti=$dbh->prepare("select enddate from z3950queue where id=?");
! 						#$sti->execute($id);
  						#my ($enddate) = $sti->fetchrow;
  						#unless ($enddate) {