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

[koha.git] / virtualshelves / downloadshelf.pl

diff --git a/virtualshelves/downloadshelf.pl b/virtualshelves/downloadshelf.pl
index f75d2d4..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;
@@ -33,7 +32,6 @@ use C4::Record;
 use C4::Ris;
 use C4::Csv;
 use utf8;
-use open qw( :std :utf8);
 my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
@@ -57,26 +55,36 @@ if ($shelfid && $format) {
     my $marcflavour         = C4::Context->preference('marcflavour');
     my $output;
 
-    # retrieve biblios from shelf
-    my $firstpass = 1;
+    # CSV 
+    if ($format =~ /^\d+$/) {
+       my @biblios;
+       foreach (@$items) {
+           push @biblios, $_->{biblionumber};
+       }
+       $output = marc2csv(\@biblios, $format);
+
+    # Other formats
+} else {
     foreach my $biblio (@$items) {
-       my $biblionumber = $biblio->{biblionumber};
+        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); }
-           # We're in the case of a csv profile (firstpass is used for headers printing) :
-           case /^\d+$/   { $output .= marc2csv($biblionumber, $format, $firstpass); }
-       }
-       $firstpass = 0;
+        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+$/);
-
+    
     print $query->header(
        -type => 'application/octet-stream',
        -'Content-Transfer-Encoding' => 'binary',