Bug 10403: (follow-up) fix test to use vendor created earlier during test

[koha.git] / virtualshelves / downloadshelf.pl

diff --git a/virtualshelves/downloadshelf.pl b/virtualshelves/downloadshelf.pl
index 9e8de6b..5c59f79 100755 (executable)
--- a/virtualshelves/downloadshelf.pl
+++ b/virtualshelves/downloadshelf.pl
@@ -22,7 +22,6 @@ use warnings;
 
 use CGI;
 use Encode qw(encode);
-use Switch;
 
 use C4::Auth;
 use C4::Biblio;
@@ -51,10 +50,9 @@ my $dbh     = C4::Context->dbh;
 
 if ($shelfid && $format) {
 
-    my @shelf               = GetShelf($shelfid);
     my ($items, $totitems)  = GetShelfContents($shelfid);
     my $marcflavour         = C4::Context->preference('marcflavour');
-    my $output;
+    my $output='';
 
     # CSV 
     if ($format =~ /^\d+$/) {
@@ -63,20 +61,21 @@ if ($shelfid && $format) {
            push @biblios, $_->{biblionumber};
        }
        $output = marc2csv(\@biblios, $format);
-
-    # Other formats
-    } else {
-       foreach my $biblio (@$items) {
-           my $biblionumber = $biblio->{biblionumber};
-
-           my $record = GetMarcBiblio($biblionumber);
-
-           switch ($format) {
-               case "iso2709" { $output .= $record->as_usmarc(); }
-               case "ris"     { $output .= marc2ris($record); }
-               case "bibtex"  { $output .= marc2bibtex($record, $biblionumber); }
-           }
-       }
+    }
+    else { #Other formats
+        foreach my $biblio (@$items) {
+            my $biblionumber = $biblio->{biblionumber};
+            my $record = GetMarcBiblio($biblionumber, 1);
+            if ($format eq 'iso2709') {
+                $output .= $record->as_usmarc();
+            }
+            elsif ($format eq 'ris') {
+                $output .= marc2ris($record);
+            }
+            elsif ($format eq 'bibtex') {
+                $output .= marc2bibtex($record, $biblionumber);
+            }
+        }
     }
 
     # If it was a CSV export we change the format after the export so the file extension is fine
@@ -87,9 +86,9 @@ if ($shelfid && $format) {
        -'Content-Transfer-Encoding' => 'binary',
        -attachment=>"shelf.$format");
     print $output;
-
-} else {
-    $template->param(csv_profiles => GetCsvProfilesLoop());
+}
+else {
+    $template->param(csv_profiles => GetCsvProfilesLoop('marc'));
     $template->param(shelfid => $shelfid); 
     output_html_with_http_headers $query, $cookie, $template->output;
 }