X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=virtualshelves%2Fdownloadshelf.pl;h=5c59f792932fff7e9f16164546c8a5b8b28543dc;hb=c6f091cc2348512e5a707cc9e0d8286b8e2ada0c;hp=1611f1abd6d8b60635dc58e5155f63d121b46569;hpb=a3ff0bb5cb91761677f8b3ff08fa5f12378376af;p=koha.git

diff --git a/virtualshelves/downloadshelf.pl b/virtualshelves/downloadshelf.pl
index 1611f1abd6..5c59f79293 100755
--- a/virtualshelves/downloadshelf.pl
+++ b/virtualshelves/downloadshelf.pl
@@ -50,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+$/) {
@@ -62,25 +61,22 @@ 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, 1);
-
-        if ($format eq 'iso2709') {
-            $output .= $record->as_usmarc();
-        }
-        elsif ($format eq 'ris') {
-            $output .= marc2ris($record);
-        }
-        elsif ($format eq '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
     $format = "csv" if ($format =~ m/^\d+$/);
@@ -90,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;
 }