X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=virtualshelves%2Fdownloadshelf.pl;h=5c59f792932fff7e9f16164546c8a5b8b28543dc;hb=9c5e40e4923179bf0b2b630d3e09797dc4c1fdb0;hp=03f3a5ce8d52d453a6cf92d5f81cd5321904bc25;hpb=8ad2c7d7acc3cb0033426bd78928214a22ad9dd1;p=koha.git

diff --git a/virtualshelves/downloadshelf.pl b/virtualshelves/downloadshelf.pl
index 03f3a5ce8d..5c59f79293 100755
--- 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 (
@@ -52,39 +50,45 @@ 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='';
 
-    # retrieve biblios from shelf
-    my $firstpass = 1;
-    foreach my $biblio (@$items) {
-	my $biblionumber = $biblio->{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($record, $format, $firstpass); }
+    # CSV 
+    if ($format =~ /^\d+$/) {
+	my @biblios;
+	foreach (@$items) {
+	    push @biblios, $_->{biblionumber};
 	}
-	$firstpass = 0;
+	$output = marc2csv(\@biblios, $format);
+    }
+    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+$/);
-
+    
     print $query->header(
 	-type => 'application/octet-stream',
 	-'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;
 }