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

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

diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index fe69564..ed39f72 100755 (executable)
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -60,6 +60,14 @@ use Koha::RecordProcessor;
 use Koha::Biblios;
 
 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-ISBDdetail.tt",
@@ -70,40 +78,32 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $biblionumber = $query->param('biblionumber');
-$biblionumber = int($biblionumber);
-
-# get biblionumbers stored in the cart
-if(my $cart_list = $query->cookie("bib_list")){
-    my @cart_list = split(/\//, $cart_list);
-    if ( grep {$_ eq $biblionumber} @cart_list) {
-        $template->param( incart => 1 );
-    }
-}
-
-my $marcflavour      = C4::Context->preference("marcflavour");
-
-my @items = GetItemsInfo($biblionumber);
-if (scalar @items >= 1) {
-    my @hiddenitems = GetHiddenItemnumbers(@items);
-
-    if (scalar @hiddenitems == scalar @items ) {
-        print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early
-        exit;
-    }
+my $patron = Koha::Patrons->find( $loggedinuser );
+my $borcat = q{};
+if ( $patron && C4::Context->preference('OpacHiddenItemsExceptions') ) {
+    $borcat = $patron->categorycode;
 }
 
 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 $biblio = Koha::Biblios->find( $biblionumber );
+my $framework = $biblio ? $biblio->frameworkcode : q{};
+my ($tag_itemnumber, $subtag_itemnumber) = &GetMarcFromKohaField('items.itemnumber',$framework);
+my @nonhiddenitems = $record->field($tag_itemnumber);
+if (scalar @all_items >= 1 && scalar @nonhiddenitems == 0) {
+    print $query->redirect('/cgi-bin/koha/errors/404.pl'); # escape early
+    exit;
+}
 
-my $framework = GetFrameworkCode( $biblionumber );
 my $record_processor = Koha::RecordProcessor->new({
     filters => 'ViewPolicy',
     options => {
@@ -113,6 +113,16 @@ my $record_processor = Koha::RecordProcessor->new({
 });
 $record_processor->process($record);
 
+# get biblionumbers stored in the cart
+if(my $cart_list = $query->cookie("bib_list")){
+    my @cart_list = split(/\//, $cart_list);
+    if ( grep {$_ eq $biblionumber} @cart_list) {
+        $template->param( incart => 1 );
+    }
+}
+
+my $marcflavour      = C4::Context->preference("marcflavour");
+
 # some useful variables for enhanced content;
 # in each case, we're grabbing the first value we find in
 # the record and normalizing it
@@ -134,7 +144,6 @@ $template->param(
 
 #coping with subscriptions
 my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
-my $dbh = C4::Context->dbh;
 my $dat                 = TransformMarcToKoha( $record );
 
 my @subscriptions       = SearchSubscriptions({ biblionumber => $biblionumber, orderby => 'title' });
@@ -169,8 +178,7 @@ my $res = GetISBDView({
 });
 
 my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
-my $patron = Koha::Patrons->find( $loggedinuser );
-for my $itm (@items) {
+for my $itm (@all_items) {
     my $item = Koha::Items->find( $itm->{itemnumber} );
     $norequests = 0
       if $norequests