[Koha-cvs] CVS: koha/z3950 processz3950queue,1.10.2.2,1.10.2.3

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_0
	processz3950queue 
Log Message:
modifs in db handling to see if it works better...

Index: processz3950queue
===================================================================
RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -C2 -r1.10.2.2 -r1.10.2.3
*** processz3950queue	28 Jan 2004 16:43:50 -0000	1.10.2.2
--- processz3950queue	26 Feb 2004 16:39:28 -0000	1.10.2.3
***************
*** 248,252 ****
  								print "$$/$id : connected to $globalname\n";
   								eval {$conn->option(elementSetName => 'F')};
! 								eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::USMARC);} if ($globalsyntax eq "USMARC");
   								eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::UNIMARC);} if ($globalsyntax eq "UNIMARC");
   								if ($@) {
--- 248,252 ----
  								print "$$/$id : connected to $globalname\n";
   								eval {$conn->option(elementSetName => 'F')};
! 								eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::USMARC);} if ($globalsyntax eq "MARC21");
   								eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::UNIMARC);} if ($globalsyntax eq "UNIMARC");
   								if ($@) {
***************
*** 273,284 ****
   										my $marcdata;
  										# use render() or rawdata() depending on the type of the returned record
- 										my $marcrecord;
  										if (ref($rec) eq "Net::Z3950::Record::USMARC") {
  											$marcdata = $rec->rawdata();
- 											$marcrecord = MARC::File::USMARC::decode($rec->rawdata())
  										}
  										if (ref($rec) eq "Net::Z3950::Record::UNIMARC") {
! 											$marcdata = $rec->render();
! 											$marcrecord = MARC::File::USMARC::decode($rec->render())
  										}
  										$globalencoding = ref($rec);
--- 273,281 ----
   										my $marcdata;
  										# use render() or rawdata() depending on the type of the returned record
  										if (ref($rec) eq "Net::Z3950::Record::USMARC") {
  											$marcdata = $rec->rawdata();
  										}
  										if (ref($rec) eq "Net::Z3950::Record::UNIMARC") {
! 											$marcdata = $rec->rawdata();
  										}
  										$globalencoding = ref($rec);