Bug 21082: Update OverDrive authentication method

[koha.git] / opac / opac-downloadshelf.pl

diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl
index 9f98d91..007dd5f 100755 (executable)
--- a/opac/opac-downloadshelf.pl
+++ b/opac/opac-downloadshelf.pl
@@ -53,7 +53,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
 my $shelfnumber = $query->param('shelfnumber');
 my $format  = $query->param('format');
 my $context = $query->param('context');
-my $dbh     = C4::Context->dbh;
 
 my $shelf = Koha::Virtualshelves->find( $shelfnumber );
 if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
@@ -71,7 +70,7 @@ if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
         if ($format =~ /^\d+$/) {
             my @biblios;
             while ( my $content = $contents->next ) {
-                push @biblios, $content->biblionumber->biblionumber;
+                push @biblios, $content->biblionumber;
             }
             $output = marc2csv(\@biblios, $format);
         # Other formats
@@ -80,9 +79,16 @@ if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
                 filters => 'ViewPolicy'
             });
             while ( my $content = $contents->next ) {
-                my $biblionumber = $content->biblionumber->biblionumber;
-
-                my $record = GetMarcBiblio($biblionumber, 1);
+                my $biblionumber = $content->biblionumber;
+
+                my $record = GetMarcBiblio({
+                    biblionumber => $biblionumber,
+                    embed_items  => 1 });
+                my $framework = &GetFrameworkCode( $biblionumber );
+                $record_processor->options({
+                    interface => 'opac',
+                    frameworkcode => $framework
+                });
                 $record_processor->process($record);
                 next unless $record;
 
@@ -96,7 +102,6 @@ if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
                     $output .= marc2bibtex($record, $biblionumber);
                 }
                 elsif ( $format eq 'isbd' ) {
-                    my $framework = GetFrameworkCode( $biblionumber );
                     $output   .= GetISBDView({
                         'record'    => $record,
                         'template'  => 'opac',
@@ -126,7 +131,7 @@ if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
         } else {
             $template->param(fullpage => 1);
         }
-        $template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ]);
+        $template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc', used_for => 'export_records' }) ]);
         $template->param( shelf => $shelf );
         output_html_with_http_headers $query, $cookie, $template->output;
     }