Bug 7788: [SIGNED-OFF] Remove two unused calls to GetShelf

Removed two unused calls. Initialized $output in downloadshelf. Corrected some confusing indentation in downloadhself too.

signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl
index 1057a16..662eb25 100755 (executable)
--- a/opac/opac-downloadshelf.pl
+++ b/opac/opac-downloadshelf.pl
@@ -52,7 +52,6 @@ if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $sh
 
     if ($shelfid && $format) {
 
-        my @shelf               = GetShelf($shelfid);
         my ($items, $totitems)  = GetShelfContents($shelfid);
         my $marcflavour         = C4::Context->preference('marcflavour');
         my $output;
@@ -103,4 +102,4 @@ if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $sh
 } else {
     $template->param(invalidlist => 1); 
     output_html_with_http_headers $query, $cookie, $template->output;
-}
\ No newline at end of file
+}

diff --git a/virtualshelves/downloadshelf.pl b/virtualshelves/downloadshelf.pl
index 1611f1a..1f6ddd9 100755 (executable)
--- 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,8 +86,8 @@ if ($shelfid && $format) {
        -'Content-Transfer-Encoding' => 'binary',
        -attachment=>"shelf.$format");
     print $output;
-
-} else {
+}
+else {
     $template->param(csv_profiles => GetCsvProfilesLoop());
     $template->param(shelfid => $shelfid); 
     output_html_with_http_headers $query, $cookie, $template->output;