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

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        06/09/04 08:11:52

Modified files:
        z3950          : processz3950queue 

Log message:
        sync with rel_2_2.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/z3950/processz3950queue?cvsroot=koha&only_with_tag=rel_3_0&r1=1.16&r2=1.16.2.1

Patches:
Index: processz3950queue
===================================================================
RCS file: /sources/koha/koha/z3950/Attic/processz3950queue,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -b -r1.16 -r1.16.2.1
--- processz3950queue   4 Jul 2006 14:36:52 -0000       1.16
+++ processz3950queue   4 Sep 2006 08:11:52 -0000       1.16.2.1
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: processz3950queue,v 1.16 2006/07/04 14:36:52 toins Exp $
+# $Id: processz3950queue,v 1.16.2.1 2006/09/04 08:11:52 toins 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";