[Koha-cvs] CVS: koha/z3950 z3950import.pl,1.4,1.5

[Paul POULAIN]

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

Modified Files:
	z3950import.pl 
Log Message:
synch'ing with rel_2_0

Index: z3950import.pl
===================================================================
RCS file: /cvsroot/koha/koha/z3950/z3950import.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** z3950import.pl	15 Jul 2003 00:02:49 -0000	1.4
--- z3950import.pl	12 Jan 2004 16:56:29 -0000	1.5
***************
*** 163,172 ****
  	my $id=$1;
  	my $resultsid=$input->param('resultsid');
! 	my $sth=$dbh->prepare("select results from z3950results where id=$resultsid");
! 	$sth->execute;
  	($data) = $sth->fetchrow;
      } else {
! 	my $sth=$dbh->prepare("select marc from uploadedmarc where id=$file");
! 	$sth->execute;
  	($data) = $sth->fetchrow;
      }
--- 163,172 ----
  	my $id=$1;
  	my $resultsid=$input->param('resultsid');
! 	my $sth=$dbh->prepare("select results from z3950results where id=?");
! 	$sth->execute($resultsid);
  	($data) = $sth->fetchrow;
      } else {
! 	my $sth=$dbh->prepare("select marc from uploadedmarc where id=?");
! 	$sth->execute($file);
  	($data) = $sth->fetchrow;
      }
***************
*** 254,259 ****
      if (not $file=~/Z-(\d+)/) {
  	# This is a Marc upload
! 	$sth=$dbh->prepare("select marc,name from uploadedmarc where id=$file");
! 	$sth->execute;
  	($data, $name) = $sth->fetchrow;
  	$template->param(IS_MARC => 1);
--- 254,259 ----
      if (not $file=~/Z-(\d+)/) {
  	# This is a Marc upload
! 	$sth=$dbh->prepare("select marc,name from uploadedmarc where id=?");
! 	$sth->execute($file);
  	($data, $name) = $sth->fetchrow;
  	$template->param(IS_MARC => 1);
***************
*** 998,1001 ****
--- 998,1007 ----
  #---------------
  # $Log$
+ # Revision 1.5  2004/01/12 16:56:29  tipaul
+ # synch'ing with rel_2_0
+ #
+ # Revision 1.4.2.1  2004/01/08 16:31:54  slef
+ # DBI call fix for bug 662. No syntax check: missing module?
+ #
  # Revision 1.4  2003/07/15 00:02:49  slef
  # Work on bug 515... can we do a single-side rename of notes to bnotes?