[Koha-cvs] koha/C4 Biblio.pm

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     Antoine Farnault <toins>        07/06/15 09:40:07

Modified files:
        C4             : Biblio.pm 

Log message:
        do not get $3 $4 and $5 on GetMarcSubjects GetMarcAuthors on unimarc 
flavour.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&r1=1.210&r2=1.211

Patches:
Index: Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -b -r1.210 -r1.211
--- Biblio.pm   13 Jun 2007 13:03:34 -0000      1.210
+++ Biblio.pm   15 Jun 2007 09:40:06 -0000      1.211
@@ -33,7 +33,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.210 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.211 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 @ISA = qw( Exporter );
 
@@ -1416,7 +1416,7 @@
 
 $res = GetMarcStructure($forlibrarian,$frameworkcode);
 
-Returns a reference to a big hash of hash, with the Marc structure fro the 
given frameworkcode
+Returns a reference to a big hash of hash, with the Marc structure for the 
given frameworkcode
 $forlibrarian  :if set to 1, the MARC descriptions are the librarians ones, 
otherwise it's the public (OPAC) ones
 $frameworkcode : the framework code to read
 
@@ -1731,6 +1731,17 @@
         my $label = "su:";
         my $flag = 0;
         for my $subject_subfield ( @subfields ) {
+            if (
+                $marcflavour ne 'MARC21'
+                and (
+                    ($subject_subfield->[0] eq '3') or
+                    ($subject_subfield->[0] eq '4') or
+                    ($subject_subfield->[0] eq '5')
+                )
+            )
+            {
+                next;
+            }
             my $code = $subject_subfield->[0];
             $label .= $subject_subfield->[1] . " and su-to:" unless ( $code == 
9 );
             if ( $code == 9 ) {
@@ -1788,13 +1799,24 @@
         my $count_auth = 0;
         my $and ;
         for my $authors_subfield (@subfields) {
+            if (
+                $marcflavour ne 'MARC21'
+                and (
+                    ($authors_subfield->[0] eq '3') or
+                    ($authors_subfield->[0] eq '4') or
+                    ($authors_subfield->[0] eq '5')
+                )
+            )
+            {
+                next;
+            }
                if ($count_auth ne '0'){
                $and = " and au:";
                }
             $count_auth++;
             my $subfieldcode     = $authors_subfield->[0];
             my $value            = $authors_subfield->[1];
-            $hash{'tag'}         = $field->tag;
+            $hash{tag}       = $field->tag;
             $hash{value}        .= $value . " " if ($subfieldcode != 9) ;
             $hash{link}        .= $value if ($subfieldcode eq 9);
         }
@@ -3912,8 +3934,11 @@
 
 =cut
 
-# $Id: Biblio.pm,v 1.210 2007/06/13 13:03:34 toins Exp $
+# $Id: Biblio.pm,v 1.211 2007/06/15 09:40:06 toins Exp $
 # $Log: Biblio.pm,v $
+# Revision 1.211  2007/06/15 09:40:06  toins
+# do not get $3 $4 and $5 on GetMarcSubjects GetMarcAuthors on unimarc flavour.
+#
 # Revision 1.210  2007/06/13 13:03:34  toins
 # removing warn compilation.
 #