[Koha-cvs] koha/z3950 processz3950queue [rel_2_2]

[paul poulain]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     paul poulain <tipaul>   06/08/31 16:30:27

Modified files:
        z3950          : processz3950queue 

Log message:
        accepting MARC21 as well as USMARC for USMARC prefferedRecordSyntax

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/z3950/processz3950queue?cvsroot=koha&only_with_tag=rel_2_2&r1=1.13.2.3&r2=1.13.2.4

Patches:
Index: processz3950queue
===================================================================
RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -u -b -r1.13.2.3 -r1.13.2.4
--- processz3950queue   11 Jun 2006 13:50:31 -0000      1.13.2.3
+++ processz3950queue   31 Aug 2006 16:30:26 -0000      1.13.2.4
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: processz3950queue,v 1.13.2.3 2006/06/11 13:50:31 kados Exp $
+# $Id: processz3950queue,v 1.13.2.4 2006/08/31 16:30:26 tipaul Exp $
 use MARC::Record;
 use C4::Context;
 use DBI;
@@ -258,7 +258,7 @@
                                                                print "$$/$id : 
connected to $globalname\n";
                                                                print "Global 
Syntax =>".$globalsyntax."<=";
                                                                eval 
{$conn->option(elementSetName => 'F')};
-                                                               eval { 
$conn->option(preferredRecordSyntax => 'USMARC');} if ($globalsyntax eq 
"USMARC");
+                                                               eval { 
$conn->option(preferredRecordSyntax => 'USMARC');} if ($globalsyntax eq 
"USMARC" or $globalsyntax eq 'MARC21');
                                                                eval { 
$conn->option(preferredRecordSyntax => 'UNIMARC');} if ($globalsyntax eq 
"UNIMARC");
                                                                if ($@) {
                                                                        print 
"$$/$id : $globalname ERROR: $@ for $resultsid\n";