[Koha-cvs] koha C4/Biblio.pm misc/cronjobs/zebraqueue_star... [rel_3_0]

[LAURIN arnaud]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     LAURIN arnaud <alaurin> 07/01/17 18:07:17

Modified files:
        C4             : Biblio.pm 
        misc/cronjobs  : zebraqueue_start.pl 

Log message:
        bugfixing for zebraqueue_start and biblio.pm :
        
                - Zebraqueue_start : restoring function of deletion in 
zebraqueue DB list
        
                -biblio.pm : changing method of default_record_format, now we 
have : 
                        
MARC::File::XML->default_record_format(C4::Context->preference('marcflavour'));
        
                with this line the encoding in zebra seems to be ok (in unimarc 
and marc21)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.178.2.54&r2=1.178.2.55
http://cvs.savannah.gnu.org/viewcvs/koha/misc/cronjobs/zebraqueue_start.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4

Patches:
Index: C4/Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.178.2.54
retrieving revision 1.178.2.55
diff -u -b -r1.178.2.54 -r1.178.2.55
--- C4/Biblio.pm        16 Jan 2007 15:00:03 -0000      1.178.2.54
+++ C4/Biblio.pm        17 Jan 2007 18:07:17 -0000      1.178.2.55
@@ -33,7 +33,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.178.2.54 $' =~ /\d+/g; 
shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.178.2.55 $' =~ /\d+/g; 
shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
 
 @ISA = qw( Exporter );
 
@@ -1427,7 +1427,7 @@
     $sth->execute($biblionumber);
     my ($marcxml) = $sth->fetchrow;
 #     warn "marcxml : $marcxml";
-#     MARC::File::XML->default_record_format('UNIMARC');
+       
MARC::File::XML->default_record_format(C4::Context->preference('marcflavour'));
     $marcxml =~ s/\x1e//g;
     $marcxml =~ s/\x1f//g;
     $marcxml =~ s/\x1d//g;
@@ -3659,8 +3659,18 @@
 
 =cut
 
-# $Id: Biblio.pm,v 1.178.2.54 2007/01/16 15:00:03 tipaul Exp $
+# $Id: Biblio.pm,v 1.178.2.55 2007/01/17 18:07:17 alaurin Exp $
 # $Log: Biblio.pm,v $
+# Revision 1.178.2.55  2007/01/17 18:07:17  alaurin
+# bugfixing for zebraqueue_start and biblio.pm :
+#
+#      - Zebraqueue_start : restoring function of deletion in zebraqueue DB 
list
+#
+#      -biblio.pm : changing method of default_record_format, now we have :
+#              
MARC::File::XML->default_record_format(C4::Context->preference('marcflavour'));
+#
+#      with this line the encoding in zebra seems to be ok (in unimarc and 
marc21)
+#
 # Revision 1.178.2.54  2007/01/16 15:00:03  tipaul
 # donc try to delete the biblio in koha, just fill zebraqueue table !
 #

Index: misc/cronjobs/zebraqueue_start.pl
===================================================================
RCS file: /sources/koha/koha/misc/cronjobs/Attic/zebraqueue_start.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- misc/cronjobs/zebraqueue_start.pl   17 Jan 2007 11:42:39 -0000      1.1.2.3
+++ misc/cronjobs/zebraqueue_start.pl   17 Jan 2007 18:07:17 -0000      1.1.2.4
@@ -43,7 +43,7 @@
         } else {
             # get the XML
             if ($server eq "biblioserver") {
-                my $marc =GetMarcBiblio($biblionumber);
+                my $marc = GetMarcBiblio($biblionumber);
                 $marcxml = $marc->as_xml_record() if $marc;
             } elsif ($server eq "authorityserver") {
                 $marcxml 
=C4::AuthoritiesMarc::XMLgetauthority($dbh,$biblionumber);
@@ -73,7 +73,7 @@
         }
     };
     print "ZEBRAopserver returned : $ok \n" if $verbose;
-    if (0 && $ok ==1) {
+    if ($ok ==1) {
         $dbh=C4::Context->dbh;
         my $delsth;
         # if it's a deletion, we can delete every request on this biblio : in 
case the user