Bug 21249: Code cleaning

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

diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl
index 94bdae1..99d14a7 100755 (executable)
--- a/opac/opac-downloadshelf.pl
+++ b/opac/opac-downloadshelf.pl
@@ -17,8 +17,7 @@
 # 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);
@@ -29,12 +28,18 @@ use C4::Items;
 use C4::Output;
 use C4::Record;
 use C4::Ris;
-use C4::Csv;
-
+use Koha::CsvProfiles;
+use Koha::RecordProcessor;
 use Koha::Virtualshelves;
 
 use utf8;
-my $query = new CGI;
+my $query = CGI->new;
+
+# 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 (
     {
@@ -45,10 +50,16 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     }
 );
 
+my $borcat = q{};
+if ( C4::Context->preference('OpacHiddenItemsExceptions') ) {
+    # we need to fetch the borrower info here, so we can pass the category
+    my $borrower = Koha::Patrons->find( { borrowernumber => $borrowernumber } );
+    $borcat = $borrower ? $borrower->categorycode : $borcat;
+}
+
 my $shelfnumber = $query->param('shelfnumber');
 my $format  = $query->param('format');
 my $context = $query->param('context');
-my $dbh     = C4::Context->dbh;
 
 my $shelf = Koha::Virtualshelves->find( $shelfnumber );
 if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
@@ -57,24 +68,44 @@ if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
 
 
         my $contents = $shelf->get_contents;
-        my $marcflavour         = C4::Context->preference('marcflavour');
+        my $marcflavour = C4::Context->preference('marcflavour');
         my $output;
         my $extension;
         my $type;
 
        # CSV
         if ($format =~ /^\d+$/) {
+
+            my $csv_profile = Koha::CsvProfiles->find($format);
+            if ( not $csv_profile or $csv_profile->staff_only ) {
+                print $query->redirect('/cgi-bin/koha/errors/404.pl');
+                exit;
+            }
+
             my @biblios;
             while ( my $content = $contents->next ) {
-                push @biblios, $content->biblionumber->biblionumber;
+                push @biblios, $content->biblionumber;
             }
             $output = marc2csv(\@biblios, $format);
         # Other formats
         } else {
+            my $record_processor = Koha::RecordProcessor->new({
+                filters => 'ViewPolicy'
+            });
             while ( my $content = $contents->next ) {
-                my $biblionumber = $content->biblionumber->biblionumber;
-
-                my $record = GetMarcBiblio($biblionumber, 1);
+                my $biblionumber = $content->biblionumber;
+
+                my $record = GetMarcBiblio({
+                    biblionumber => $biblionumber,
+                    embed_items  => 1,
+                    opac         => 1,
+                    borcat       => $borcat });
+                my $framework = &GetFrameworkCode( $biblionumber );
+                $record_processor->options({
+                    interface => 'opac',
+                    frameworkcode => $framework
+                });
+                $record_processor->process($record);
                 next unless $record;
 
                 if ($format eq 'iso2709') {
@@ -87,7 +118,11 @@ if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
                     $output .= marc2bibtex($record, $biblionumber);
                 }
                 elsif ( $format eq 'isbd' ) {
-                    $output   .= GetISBDView($biblionumber, "opac");
+                    $output   .= GetISBDView({
+                        'record'    => $record,
+                        'template'  => 'opac',
+                        'framework' => $framework,
+                    });
                     $extension = "txt";
                     $type      = "text/plain";
                 }
@@ -112,7 +147,17 @@ if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
         } else {
             $template->param(fullpage => 1);
         }
-        $template->param(csv_profiles => GetCsvProfilesLoop('marc'));
+        $template->param(
+            csv_profiles => [
+                Koha::CsvProfiles->search(
+                    {
+                        type       => 'marc',
+                        used_for   => 'export_records',
+                        staff_only => 0
+                    }
+                )
+            ]
+        );
         $template->param( shelf => $shelf );
         output_html_with_http_headers $query, $cookie, $template->output;
     }