ffzg/recall_notices.pl: added --interval and --dedup

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

diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index d438036..4867eda 100755 (executable)
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -64,39 +64,53 @@ use Koha::ItemTypes;
 use Koha::Patrons;
 use Koha::RecordProcessor;
 
-my $query = new CGI;
-
-my $dbh = C4::Context->dbh;
+my $query = CGI->new();
 
 my $biblionumber = $query->param('biblionumber');
 if ( ! $biblionumber ) {
     print $query->redirect("/cgi-bin/koha/errors/404.pl");
     exit;
 }
+$biblionumber = int($biblionumber);
+
+# open template
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "opac-MARCdetail.tt",
+        query           => $query,
+        type            => "opac",
+        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
+        debug           => 1,
+    }
+);
+
+my $patron = Koha::Patrons->find( $loggedinuser );
+my $borcat = q{};
+if ( C4::Context->preference('OpacHiddenItemsExceptions') ) {
+    # we need to fetch the borrower info here, so we can pass the category
+    $borcat = $patron ? $patron->categorycode : $borcat;
+}
 
 my $record = GetMarcBiblio({
     biblionumber => $biblionumber,
-    embed_items  => 1 });
+    embed_items  => 1,
+    opac         => 1,
+    borcat       => $borcat });
 if ( ! $record ) {
     print $query->redirect("/cgi-bin/koha/errors/404.pl");
     exit;
 }
 
 my @all_items = GetItemsInfo($biblionumber);
-my @items2hide;
-if (scalar @all_items >= 1) {
-    push @items2hide, GetHiddenItemnumbers(@all_items);
-
-    if (scalar @items2hide == scalar @all_items ) {
-        print $query->redirect("/cgi-bin/koha/errors/404.pl");
-        exit;
-    }
-}
-
-my $framework = &GetFrameworkCode( $biblionumber );
+my $biblio = Koha::Biblios->find( $biblionumber );
+my $framework = $biblio ? $biblio->frameworkcode : q{};
 my $tagslib = &GetMarcStructure( 0, $framework );
 my ($tag_itemnumber,$subtag_itemnumber) = &GetMarcFromKohaField('items.itemnumber',$framework);
-my $biblio = Koha::Biblios->find( $biblionumber );
+my @nonhiddenitems = $record->field($tag_itemnumber);
+if (scalar @all_items >= 1 && scalar @nonhiddenitems == 0) {
+    print $query->redirect("/cgi-bin/koha/errors/404.pl");
+    exit;
+}
 
 my $record_processor = Koha::RecordProcessor->new({
     filters => 'ViewPolicy',
@@ -107,23 +121,6 @@ my $record_processor = Koha::RecordProcessor->new({
 });
 $record_processor->process($record);
 
-# open template
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "opac-MARCdetail.tt",
-        query           => $query,
-        type            => "opac",
-        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
-        debug           => 1,
-    }
-);
-
-my ($bt_tag,$bt_subtag) = GetMarcFromKohaField('biblio.title',$framework);
-$template->param(
-    bibliotitle => $biblio->title,
-) if $tagslib->{$bt_tag}->{$bt_subtag}->{hidden} <= 0 && # <=0 OPAC visible.
-     $tagslib->{$bt_tag}->{$bt_subtag}->{hidden} > -8;   # except -8;
-
 # get biblionumbers stored in the cart
 if(my $cart_list = $query->cookie("bib_list")){
     my @cart_list = split(/\//, $cart_list);
@@ -132,8 +129,13 @@ if(my $cart_list = $query->cookie("bib_list")){
     }
 }
 
+my ($bt_tag,$bt_subtag) = GetMarcFromKohaField('biblio.title',$framework);
+$template->param(
+    bibliotitle => $biblio->title,
+) if $tagslib->{$bt_tag}->{$bt_subtag}->{hidden} <= 0 && # <=0 OPAC visible.
+     $tagslib->{$bt_tag}->{$bt_subtag}->{hidden} > -8;   # except -8;
+
 my $allow_onshelf_holds;
-my $patron = Koha::Patrons->find( $loggedinuser );
 for my $itm (@all_items) {
     my $item = Koha::Items->find( $itm->{itemnumber} );
     $allow_onshelf_holds = Koha::IssuingRules->get_onshelfholds_policy( { item => $item, patron => $patron } );
@@ -272,6 +274,7 @@ for ( my $tabloop = 0 ; $tabloop <= 9 ; $tabloop++ ) {
 # loop through each tag
 # warning : we may have differents number of columns in each row. Thus, we first build a hash, complete it if necessary
 # then construct template.
+# $record has already had all the item fields filtered above.
 my @fields = $record->fields();
 my %witness
   ; #---- stores the list of subfields used at least once, with the "meaning" of the code
@@ -279,9 +282,6 @@ my @item_subfield_codes;
 my @item_loop;
 foreach my $field (@fields) {
     next if ( $field->tag() < 10 );
-    next if ( ( $field->tag() eq $tag_itemnumber ) &&
-              ( any { $field->subfield($subtag_itemnumber) eq $_ }
-                   @items2hide) );
     my @subf = $field->subfields;
     my $item;