Bug 24606: (QA follow-up) Fix Template.t

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

diff --git a/opac/opac-downloadcart.pl b/opac/opac-downloadcart.pl
index 7720cd4..1f4b20d 100755 (executable)
--- a/opac/opac-downloadcart.pl
+++ b/opac/opac-downloadcart.pl
@@ -20,14 +20,14 @@
 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;
 
@@ -49,12 +49,7 @@ my $dbh     = C4::Context->dbh;
 
 if ($bib_list && $format) {
 
-    my $borcat = q{};
-    if ( C4::Context->preference('OpacHiddenItemsExceptions') ) {
-        # we need to fetch the borrower info here, so we can pass the category
-        my $borrower = Koha::Patrons->find( { borrowernumber => $borrowernumber } );
-        $borcat = $borrower ? $borrower->categorycode : $borcat;
-    }
+    my $patron = Koha::Patrons->find($borrowernumber);
 
     my @bibs = split( /\//, $bib_list );
 
@@ -66,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
@@ -73,13 +74,16 @@ if ($bib_list && $format) {
         my $record_processor = Koha::RecordProcessor->new({
             filters => 'ViewPolicy'
         });
-        foreach my $biblio (@bibs) {
+        foreach my $biblionumber (@bibs) {
 
-            my $record = GetMarcBiblio({
-                biblionumber => $biblio,
-                embed_items  => 1,
-                opac         => 1,
-                borcat       => $borcat });
+            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',
@@ -125,16 +129,14 @@ if ($bib_list && $format) {
 
 } else { 
     $template->param(
-        csv_profiles => [
-            Koha::CsvProfiles->search(
-                {
-                    type       => 'marc',
-                    used_for   => 'export_records',
-                    staff_only => 0
-                }
-            )
-        ]
+        csv_profiles => Koha::CsvProfiles->search(
+            {
+                type       => 'marc',
+                used_for   => 'export_records',
+                staff_only => 0
+            }
+        ),
+        bib_list => $bib_list,
     );
-    $template->param(bib_list => $bib_list); 
     output_html_with_http_headers $query, $cookie, $template->output;
 }