Attachment 8477 Details for Bug 7788 – Patch for unused calls

[patch] Patch for unused calls

patch.txt (text/plain), 3.43 KB, created by Marcel de Rooy on 2012-03-22 09:44:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2012-03-22 09:44:28 UTC

Size: 3.43 KB

patch

obsolete

>From d6db98e5db78dc641afbc108e96c7c538426a70d Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Thu, 22 Mar 2012 10:36:41 +0100
>Subject: [PATCH] 7788 Remove two unused calls to GetShelf
>Content-Type: text/plain; charset="utf-8"
>
>Removed two unused calls. Initialized $output in downloadshelf. Corrected some confusing indentation in downloadhself too.
>---
> opac/opac-downloadshelf.pl      |    3 +--
> virtualshelves/downloadshelf.pl |   38 +++++++++++++++++---------------------
> 2 files changed, 18 insertions(+), 23 deletions(-)
>
>diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl
>index 1057a16..662eb25 100755
>--- 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..77ea35d 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,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;
>-- 
>1.6.0.6
>

Actions: View | Diff | Splinter Review

Attachments on bug 7788: 8477 | 8478 | 8481 | 9508 | 9509