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

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

diff --git a/opac/opac-downloadcart.pl b/opac/opac-downloadcart.pl
index 3a4cdc1..c5574e3 100755 (executable)
--- a/opac/opac-downloadcart.pl
+++ b/opac/opac-downloadcart.pl
@@ -4,30 +4,29 @@
 #
 # 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 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;
@@ -36,11 +35,10 @@ my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
-        template_name   => "opac-downloadcart.tmpl",
+        template_name   => "opac-downloadcart.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 1,
-        flagsrequired   => { borrow => 1 },
+        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
     }
 );
 
@@ -52,8 +50,10 @@ if ($bib_list && $format) {
 
     my @bibs = split( /\//, $bib_list );
 
-    my $marcflavour         = C4::Context->preference('marcflavour');
+    my $marcflavour = C4::Context->preference('marcflavour');
     my $output;
+    my $extension;
+    my $type;
 
     # CSV   
     if ($format =~ /^\d+$/) {
@@ -76,6 +76,11 @@ if ($bib_list && $format) {
             elsif ($format eq 'bibtex') {
                 $output .= marc2bibtex($record, $biblio);
             }
+            elsif ( $format eq 'isbd' ) {
+                $output   .= GetISBDView($biblio, "opac");
+                $extension = "txt";
+                $type      = "text/plain";
+            }
         }
     }
 
@@ -83,13 +88,14 @@ if ($bib_list && $format) {
     $format = "csv" if ($format =~ m/^\d+$/);
 
     print $query->header(
-       -type => 'application/octet-stream',
-       -'Content-Transfer-Encoding' => 'binary',
-       -attachment=>"cart.$format");
+                               -type => ($type) ? $type : 'application/octet-stream',
+        -'Content-Transfer-Encoding' => 'binary',
+                         -attachment => ($extension) ? "cart.$format.$extension" : "cart.$format"
+    );
     print $output;
 
 } else { 
-    $template->param(csv_profiles => GetCsvProfilesLoop());
+    $template->param(csv_profiles => GetCsvProfilesLoop('marc'));
     $template->param(bib_list => $bib_list); 
     output_html_with_http_headers $query, $cookie, $template->output;
 }