X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-downloadshelf.pl;h=8413e7543420d2344944baed1e479b1f9082691a;hb=814a1d4231c8e71613ce58a72b30a539654c34ee;hp=012e51b6a1404499c3fc9134608e1a10fb7f0f01;hpb=e185aaf19b1efeee342fc32a35323a0a9ea03a58;p=srvgit

diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl
index 012e51b6a1..8413e75434 100755
--- a/opac/opac-downloadshelf.pl
+++ b/opac/opac-downloadshelf.pl
@@ -4,72 +4,81 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 use Encode qw(encode);
 
 use C4::Auth;
 use C4::Biblio;
 use C4::Items;
 use C4::Output;
-use C4::VirtualShelves;
 use C4::Record;
 use C4::Ris;
 use C4::Csv;
+
+use Koha::CsvProfiles;
+use Koha::Virtualshelves;
+
 use utf8;
 my $query = new CGI;
 
+# if virtualshelves is disabled, leave immediately
+if ( ! C4::Context->preference('virtualshelves') ) {
+    print $query->redirect("/cgi-bin/koha/errors/404.pl");
+    exit;
+}
+
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
         template_name   => "opac-downloadshelf.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 1,
-        flagsrequired   => { borrow => 1 },
+        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
     }
 );
 
-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 ($shelfnumber && $format) {
 
-    if ($shelfid && $format) {
 
-        my ($items, $totitems)  = GetShelfContents($shelfid);
+        my $contents = $shelf->get_contents;
         my $marcflavour         = C4::Context->preference('marcflavour');
         my $output;
+        my $extension;
+        my $type;
 
        # 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;
@@ -83,6 +92,11 @@ if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $sh
                 elsif ($format eq 'bibtex') {
                     $output .= marc2bibtex($record, $biblionumber);
                 }
+                elsif ( $format eq 'isbd' ) {
+                    $output   .= GetISBDView($biblionumber, "opac");
+                    $extension = "txt";
+                    $type      = "text/plain";
+                }
             }
         }
 
@@ -90,30 +104,22 @@ if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $sh
         $format = "csv" if ($format =~ m/^\d+$/);
 
         print $query->header(
-    	-type => 'application/octet-stream',
-    	-'Content-Transfer-Encoding' => 'binary',
-    	-attachment=>"shelf.$format");
+                                   -type => ($type) ? $type : 'application/octet-stream',
+            -'Content-Transfer-Encoding' => 'binary',
+                             -attachment => ($extension) ? "shelf.$format.$extension" : "shelf.$format"
+        );
         print $output;
 
     } else {
 
-        # get details of the list
-        my ($shelfnumber,$shelfname,$owner,$category,$sorton) = GetShelf($shelfid);
-
         # if modal context is passed set a variable so that page markup can be different
         if($context eq "modal"){
             $template->param(modal => 1);
         } else {
             $template->param(fullpage => 1);
         }
-        $template->param(csv_profiles => GetCsvProfilesLoop('marc'));
-        $template->param(
-            showprivateshelves  => $showprivateshelves,
-            shelfid             => $shelfid,
-            shelfname           => $shelfname,
-            shelfnumber         => $shelfnumber,
-            viewshelf           => $shelfnumber
-        );
+        $template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ]);
+        $template->param( shelf => $shelf );
         output_html_with_http_headers $query, $cookie, $template->output;
     }