Bug 14544: Get rid of C4::VirtualShelves and C4::VirtualShelves::Page

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

diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl
index 15a85dc..94bdae1 100755 (executable)
--- a/opac/opac-downloadshelf.pl
+++ b/opac/opac-downloadshelf.pl
@@ -27,7 +27,6 @@ use C4::Auth;
 use C4::Biblio;
 use C4::Items;
 use C4::Output;
-use C4::VirtualShelves;
 use C4::Record;
 use C4::Ris;
 use C4::Csv;
@@ -46,17 +45,18 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     }
 );
 
-my $shelfid = $query->param('shelfid');
+my $shelfnumber = $query->param('shelfnumber');
 my $format  = $query->param('format');
 my $context = $query->param('context');
-my $showprivateshelves = $query->param('showprivateshelves');
 my $dbh     = C4::Context->dbh;
 
-if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $shelfid, 'view' ) ) {
+my $shelf = Koha::Virtualshelves->find( $shelfnumber );
+if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
 
-    if ($shelfid && $format) {
+    if ($shelfnumber && $format) {
 
-        my ($items, $totitems)  = GetShelfContents($shelfid);
+
+        my $contents = $shelf->get_contents;
         my $marcflavour         = C4::Context->preference('marcflavour');
         my $output;
         my $extension;
@@ -65,15 +65,14 @@ if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $sh
        # CSV
         if ($format =~ /^\d+$/) {
             my @biblios;
-            foreach (@$items) {
-                push @biblios, $_->{biblionumber};
+            while ( my $content = $contents->next ) {
+                push @biblios, $content->biblionumber->biblionumber;
             }
             $output = marc2csv(\@biblios, $format);
-                
         # Other formats
         } else {
-            foreach my $biblio (@$items) {
-                my $biblionumber = $biblio->{biblionumber};
+            while ( my $content = $contents->next ) {
+                my $biblionumber = $content->biblionumber->biblionumber;
 
                 my $record = GetMarcBiblio($biblionumber, 1);
                 next unless $record;
@@ -107,8 +106,6 @@ if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $sh
 
     } else {
 
-        my $shelf = Koha::Virtualshelves->find( $shelfid );
-
         # if modal context is passed set a variable so that page markup can be different
         if($context eq "modal"){
             $template->param(modal => 1);
@@ -116,13 +113,7 @@ if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $sh
             $template->param(fullpage => 1);
         }
         $template->param(csv_profiles => GetCsvProfilesLoop('marc'));
-        $template->param(
-            showprivateshelves  => $showprivateshelves,
-            shelfid             => $shelf->shelfnumber,
-            shelfnumber         => $shelf->shelfnumber,
-            viewshelf           => $shelf->shelfnumber,
-            shelfname           => $shelf->shelfname,
-        );
+        $template->param( shelf => $shelf );
         output_html_with_http_headers $query, $cookie, $template->output;
     }