Bug 3150: Move emails for sending cart and list contents to notices

[srvgit] / basket / downloadcart.pl

diff --git a/basket/downloadcart.pl b/basket/downloadcart.pl
index 2c71951..806ad49 100755 (executable)
--- a/basket/downloadcart.pl
+++ b/basket/downloadcart.pl
@@ -17,30 +17,28 @@
 # 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 qw ( -utf8 );
-use Encode qw(encode);
+use Encode qw( encode );
 
-use C4::Auth;
-use C4::Biblio;
-use C4::Items;
-use C4::Output;
-use C4::VirtualShelves;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
 use C4::Record;
-use C4::Ris;
-use C4::Csv;
+use C4::Ris qw( marc2ris );
+
+use Koha::CsvProfiles;
+use Koha::Biblios;
+
 use utf8;
-my $query = new CGI;
+my $query = CGI->new;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
         template_name   => "basket/downloadcart.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { borrow => 1 },
+        flagsrequired   => { catalogue => 1 },
     }
 );
 
@@ -63,19 +61,22 @@ if ($bib_list && $format) {
     # Other formats
     } else {
 
-        foreach my $biblio (@bibs) {
+        foreach my $biblionumber (@bibs) {
 
-            my $record = GetMarcBiblio($biblio, 1);
+            my $biblio = Koha::Biblios->find($biblionumber);
+            my $record = $biblio->metadata->record({ embed_items => 1 });
             next unless $record;
 
             if ($format eq 'iso2709') {
-                $output .= $record->as_usmarc();
+                #NOTE: If we don't explicitly UTF-8 encode the output,
+                #the browser will guess the encoding, and it won't always choose UTF-8.
+                $output .= encode("UTF-8", $record->as_usmarc()) // q{};
             }
             elsif ($format eq 'ris') {
                 $output .= marc2ris($record);
             }
             elsif ($format eq 'bibtex') {
-                $output .= marc2bibtex($record, $biblio);
+                $output .= marc2bibtex($record, $biblionumber);
             }
         }
     }
@@ -90,7 +91,7 @@ if ($bib_list && $format) {
     print $output;
 
 } else { 
-    $template->param(csv_profiles => GetCsvProfilesLoop('marc'));
+    $template->param(csv_profiles => Koha::CsvProfiles->search({ type => 'marc', used_for => 'export_records' }));
     $template->param(bib_list => $bib_list); 
     output_html_with_http_headers $query, $cookie, $template->output;
 }