[Koha-cvs] CVS: koha/z3950 processz3950queue,1.14,1.15

[Paul POULAIN]

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

Modified Files:
	processz3950queue 
Log Message:
synch'ing 2.2 and head

Index: processz3950queue
===================================================================
RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** processz3950queue	4 May 2005 09:04:52 -0000	1.14
--- processz3950queue	20 Jun 2005 14:37:51 -0000	1.15
***************
*** 281,292 ****
  									for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
  										my $rec=$rs->record($i);
!  										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);
   										$result.=$marcdata;
--- 281,285 ----
  									for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
  										my $rec=$rs->record($i);
!  										my $marcdata = $rec->rawdata();
  										$globalencoding = ref($rec);
   										$result.=$marcdata;