Merge remote branch 'kc/new/bug_6104' into kcmaster

[koha.git] / virtualshelves / downloadshelf.pl

diff --git a/virtualshelves/downloadshelf.pl b/virtualshelves/downloadshelf.pl
index 9af03e0..253eec1 100755 (executable)
--- a/virtualshelves/downloadshelf.pl
+++ b/virtualshelves/downloadshelf.pl
@@ -13,16 +13,15 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
 
 use CGI;
 use Encode qw(encode);
-use Switch;
 
 use C4::Auth;
 use C4::Biblio;
@@ -65,19 +64,23 @@ if ($shelfid && $format) {
        $output = marc2csv(\@biblios, $format);
 
     # Other formats
-    } else {
-       foreach my $biblio (@$items) {
-           my $biblionumber = $biblio->{biblionumber};
+} else {
+    foreach my $biblio (@$items) {
+        my $biblionumber = $biblio->{biblionumber};
 
-           my $record = GetMarcBiblio($biblionumber);
+        my $record = GetMarcBiblio($biblionumber);
 
-           switch ($format) {
-               case "iso2709" { $output .= $record->as_usmarc(); }
-               case "ris"     { $output .= marc2ris($record); }
-               case "bibtex"  { $output .= marc2bibtex($record, $biblionumber); }
-           }
-       }
+        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+$/);