Bug 33020: Add missing Koha::Logger->history

[koha-ffzg.git] / opac / opac-downloadcart.pl

diff --git a/opac/opac-downloadcart.pl b/opac/opac-downloadcart.pl
index 76fa095..1f4b20d 100755 (executable)
--- a/opac/opac-downloadcart.pl
+++ b/opac/opac-downloadcart.pl
@@ -20,19 +20,19 @@
 use Modern::Perl;
 
 use CGI qw ( -utf8 );
-use Encode qw(encode);
+use Encode qw( encode );
 
-use C4::Auth;
-use C4::Biblio;
-use C4::Items;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Biblio qw( GetFrameworkCode GetISBDView );
+use C4::Output qw( output_html_with_http_headers );
 use C4::Record;
-use C4::Ris;
+use C4::Ris qw( marc2ris );
+use Koha::Biblios;
 use Koha::CsvProfiles;
 use Koha::RecordProcessor;
 
 use utf8;
-my $query = new CGI;
+my $query = CGI->new();
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
@@ -49,6 +49,8 @@ my $dbh     = C4::Context->dbh;
 
 if ($bib_list && $format) {
 
+    my $patron = Koha::Patrons->find($borrowernumber);
+
     my @bibs = split( /\//, $bib_list );
 
     my $marcflavour = C4::Context->preference('marcflavour');
@@ -59,6 +61,12 @@ if ($bib_list && $format) {
     # CSV   
     if ($format =~ /^\d+$/) {
 
+        my $csv_profile = Koha::CsvProfiles->find($format);
+        if ( not $csv_profile or $csv_profile->staff_only ) {
+            print $query->redirect('/cgi-bin/koha/errors/404.pl');
+            exit;
+        }
+
         $output = marc2csv(\@bibs, $format);
 
         # Other formats
@@ -66,11 +74,16 @@ if ($bib_list && $format) {
         my $record_processor = Koha::RecordProcessor->new({
             filters => 'ViewPolicy'
         });
-        foreach my $biblio (@bibs) {
-
-            my $record = GetMarcBiblio({
-                biblionumber => $biblio,
-                embed_items  => 1 });
+        foreach my $biblionumber (@bibs) {
+
+            my $biblio = Koha::Biblios->find($biblionumber);
+            my $record = $biblio->metadata->record(
+                {
+                    embed_items => 1,
+                    opac        => 1,
+                    patron      => $patron,
+                }
+            );
             my $framework = &GetFrameworkCode( $biblio );
             $record_processor->options({
                 interface => 'opac',
@@ -81,7 +94,9 @@ if ($bib_list && $format) {
             next unless $record;
 
             if ($format eq 'iso2709') {
-                $output .= $record->as_usmarc();
+                #NOTE: If we don't explicitly UTF-8 encode the output,
+                #the browser will guess the encoding, and it won't always choose UTF-8.
+                $output .= encode("UTF-8", $record->as_usmarc()) // q{};
             }
             elsif ($format eq 'ris') {
                 $output .= marc2ris($record);
@@ -113,7 +128,15 @@ if ($bib_list && $format) {
     print $output;
 
 } else { 
-    $template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc', used_for => 'export_records' }) ]);
-    $template->param(bib_list => $bib_list); 
+    $template->param(
+        csv_profiles => Koha::CsvProfiles->search(
+            {
+                type       => 'marc',
+                used_for   => 'export_records',
+                staff_only => 0
+            }
+        ),
+        bib_list => $bib_list,
+    );
     output_html_with_http_headers $query, $cookie, $template->output;
 }