X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-downloadshelf.pl;h=007dd5f72c85994f1d3c170ed51dbe03c57c4884;hb=5e2b67d8c5982029c427c75930bfec6a4395dd9f;hp=1057a16713d7eea016599c4872df0ca897c89741;hpb=16f1fffdd1f5d1c97db0bf664f83496864b7e24d;p=koha.git

diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl
index 1057a16713..007dd5f72c 100755
--- a/opac/opac-downloadshelf.pl
+++ b/opac/opac-downloadshelf.pl
@@ -4,73 +4,92 @@
 #
 # 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::RecordProcessor;
+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.tmpl",
+        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 $dbh     = C4::Context->dbh;
+my $context = $query->param('context');
 
-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 @shelf               = GetShelf($shelfid);
-        my ($items, $totitems)  = GetShelfContents($shelfid);
-        my $marcflavour         = C4::Context->preference('marcflavour');
+
+        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;
             }
             $output = marc2csv(\@biblios, $format);
-                
         # Other formats
         } else {
-            foreach my $biblio (@$items) {
-                my $biblionumber = $biblio->{biblionumber};
-
-                my $record = GetMarcBiblio($biblionumber, 1);
+            my $record_processor = Koha::RecordProcessor->new({
+                filters => 'ViewPolicy'
+            });
+            while ( my $content = $contents->next ) {
+                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;
 
                 if ($format eq 'iso2709') {
@@ -82,6 +101,15 @@ if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $sh
                 elsif ($format eq 'bibtex') {
                     $output .= marc2bibtex($record, $biblionumber);
                 }
+                elsif ( $format eq 'isbd' ) {
+                    $output   .= GetISBDView({
+                        'record'    => $record,
+                        'template'  => 'opac',
+                        'framework' => $framework,
+                    });
+                    $extension = "txt";
+                    $type      = "text/plain";
+                }
             }
         }
 
@@ -89,18 +117,26 @@ 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 {
-        $template->param(csv_profiles => GetCsvProfilesLoop());
-        $template->param(shelfid => $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 => [ Koha::CsvProfiles->search({ type => 'marc', used_for => 'export_records' }) ]);
+        $template->param( shelf => $shelf );
         output_html_with_http_headers $query, $cookie, $template->output;
     }
 
 } else {
     $template->param(invalidlist => 1); 
     output_html_with_http_headers $query, $cookie, $template->output;
-}
\ No newline at end of file
+}