X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FRis.pm;h=d601c9640afb944904550065eb10bebe2449b71d;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=dc86353ab634dc558163d3d75759fc75ceea8461;hpb=5d4d33b22d72e16a4f6a4579ea4c2d98dfa091ab;p=koha_fer

diff --git a/C4/Ris.pm b/C4/Ris.pm
index dc86353ab6..d601c9640a 100644
--- a/C4/Ris.pm
+++ b/C4/Ris.pm
@@ -65,7 +65,7 @@ package C4::Ris;
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = 3.00;
+$VERSION = 3.07.00.049;
 
 @ISA = qw(Exporter);
 
@@ -209,7 +209,12 @@ sub marc2ris {
 	    &print_pubinfo($record->field('210'));
 	}
 	else { ## marc21, ukmarc
-	    &print_pubinfo($record->field('260'));
+            if ($record->field('264')) {
+                 &print_pubinfo($record->field('264'));
+            }
+            else {
+            &print_pubinfo($record->field('260'));
+            }
 	}
 
 	## 6XX fields contain KW candidates. We add all of them to a
@@ -252,7 +257,7 @@ sub marc2ris {
 	elsif ($intype eq "ukmarc") {
 	    foreach ('500', '501', '502', '503', '504', '505', '506', '508', '514', '515', '516', '521', '524', '525', '528', '530', '531', '532', '533', '534', '535', '537', '538', '540', '541', '542', '544', '554', '555', '556', '557', '561', '563', '580', '583', '584', '586') {
 		&pool_subx(\@notepool, $_, $record->field($_));
-	    }
+        }
 	}
 	else { ## assume marc21
 	    foreach ('500', '501', '502', '504', '505', '506', '507', '508', '510', '511', '513', '514', '515', '516', '518', '521', '522', '524', '525', '526', '530', '533', '534', '535') {
@@ -642,7 +647,7 @@ sub print_pubinfo {
     my($pubinfofield) = @_;
 
     if (!$pubinfofield) {
-	print "<marc>no publication information found (260)\r\n" if $marcprint;
+    print "<marc>no publication information found (260/264)\r\n" if $marcprint;
 	warn("no publication information found") if $marcprint;
     }
     else {