bug 5780 followup: RIS export now includes all URLs

Also cleanup whitespace and adjust the line ending per
bug 6769.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/C4/Ris.pm b/C4/Ris.pm
index 616bed6..085b09c 100644 (file)
--- a/C4/Ris.pm
+++ b/C4/Ris.pm
@@ -40,6 +40,7 @@ package C4::Ris;
 
 # Modified 2008 by BibLibre for Koha
 # Modified 2011 by Catalyst
+# Modified 2011 by Equinox Software, Inc.
 #
 # This file is part of Koha.
 #
@@ -276,10 +277,10 @@ sub marc2ris {
            &print_abstract($record->field('520'));
        }
     
-        # 856u has the URI
-        if ($record->field('856')){
-           print_uri($record->field('856'));
-       }           
+    # 856u has the URI
+    if ($record->field('856')) {
+        print_uri($record->field('856'));
+    }
 
        ## end RIS dataset
        print "ER  - \r\n";
@@ -592,10 +593,12 @@ sub print_issn {
 # print_uri() prints info from 856 u 
 ###
 sub print_uri {
-    my $f856 = shift;
-    
-    if (my $uri = $f856->subfield('u')){
-       print "UR  - ", charconv($uri), "\n";
+    my @f856s = @_;
+
+    foreach my $f856 (@f856s) {
+        if (my $uri = $f856->subfield('u')) {
+               print "UR  - ", charconv($uri), "\r\n";
+        }
     }
 }