Bug 29609: Centralized code to build the link to a biblio detail page

[srvgit] / opac / opac-basket.pl

diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl
index dc38543..18737d7 100755 (executable)
--- a/opac/opac-basket.pl
+++ b/opac/opac-basket.pl
@@ -20,16 +20,23 @@ use Modern::Perl;
 use CGI qw ( -utf8 );
 
 use C4::Koha;
-use C4::Biblio;
-use C4::Items;
-use C4::Circulation;
-use C4::Auth;
-use C4::Output;
+use C4::Biblio qw(
+    GetFrameworkCode
+    GetMarcBiblio
+    GetMarcSeries
+    GetMarcSubjects
+    GetMarcUrls
+);
+use C4::Items qw( GetHiddenItemnumbers GetItemsInfo );
+use C4::Circulation qw( GetTransfers );
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
 use Koha::RecordProcessor;
-
+use Koha::CsvProfiles;
 use Koha::AuthorisedValues;
+use Koha::Biblios;
 
-my $query = new CGI;
+my $query = CGI->new;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
@@ -65,11 +72,13 @@ if ( C4::Context->preference('OpacHiddenItemsExceptions') ) {
 }
 
 my $record_processor = Koha::RecordProcessor->new({ filters => 'ViewPolicy' });
+my $rules = C4::Context->yaml_preference('OpacHiddenItems');
+
 foreach my $biblionumber ( @bibs ) {
     $template->param( biblionumber => $biblionumber );
 
-    my $dat              = &GetBiblioData($biblionumber);
-    next unless $dat;
+    my $biblio           = Koha::Biblios->find( $biblionumber ) or next;
+    my $dat              = $biblio->unblessed;
 
     # No filtering on the item records needed for the record itself
     # since the only reason item information is grabbed is because of branchcodes.
@@ -81,8 +90,8 @@ foreach my $biblionumber ( @bibs ) {
     });
     $record_processor->process($record);
     next unless $record;
-    my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
-    my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
+    my $marcnotesarray   = $biblio->get_marc_notes({ marcflavour => $marcflavour, opac => 1 });
+    my $marcauthorsarray = $biblio->get_marc_authors;
     my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
     my $marcseriesarray  = GetMarcSeries  ($record,$marcflavour);
     my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour);
@@ -94,7 +103,8 @@ foreach my $biblionumber ( @bibs ) {
     my @hidden_items     = GetHiddenItemnumbers({ items => \@all_items, borcat => $borcat });
 
     # If every item is hidden, then the biblio should be hidden too.
-    next if (scalar @all_items >= 1 && scalar @hidden_items == scalar @all_items);
+    next
+      if $biblio->hidden_in_opac({ rules => $rules });
 
     # copy the visible ones into the items array.
     my @items;
@@ -119,7 +129,6 @@ foreach my $biblionumber ( @bibs ) {
       { map { $_->{authorised_value} => $_->{opac_description} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => $dat->{frameworkcode}, kohafield => 'items.location' } ) };
 
        # COinS format FIXME: for books Only
-        my $coins_format;
         my $fmt = substr $record->leader(), 6,2;
         my $fmts;
         $fmts->{'am'} = 'book';
@@ -150,15 +159,6 @@ foreach my $biblionumber ( @bibs ) {
     $dat->{MARCURLS}    = $marcurlsarray;
     $dat->{HASAUTHORS}  = $hasauthors;
 
-    if ( C4::Context->preference("BiblioDefaultView") eq "normal" ) {
-        $dat->{dest} = "opac-detail.pl";
-    }
-    elsif ( C4::Context->preference("BiblioDefaultView") eq "marc" ) {
-        $dat->{dest} = "opac-MARCdetail.pl";
-    }
-    else {
-        $dat->{dest} = "opac-ISBDdetail.pl";
-    }
     push( @results, $dat );
 }
 
@@ -167,6 +167,8 @@ my $resultsarray = \@results;
 # my $itemsarray=\@items;
 
 $template->param(
+    csv_profiles => Koha::CsvProfiles->search(
+        { type => 'marc', used_for => 'export_records', staff_only => 0 } ),
     bib_list => $bib_list,
     BIBLIO_RESULTS => $resultsarray,
 );