Bug 17600: Standardize our EXPORT_OK

[srvgit] / catalogue / MARCdetail.pl

diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl
index 44bc8d0..7ddbbd4 100755 (executable)
--- a/catalogue/MARCdetail.pl
+++ b/catalogue/MARCdetail.pl
@@ -47,25 +47,30 @@ use Modern::Perl;
 use CGI qw ( -utf8 );
 use HTML::Entities;
 
-use C4::Auth;
+use C4::Auth qw( get_template_and_user );
 use C4::Context;
-use C4::Output;
+use C4::Output qw( output_html_with_http_headers );
 use C4::Koha;
-use MARC::Record;
-use C4::Biblio;
-use C4::Items;
-use C4::Acquisition;
-use C4::Serials;    #uses getsubscriptionsfrombiblionumber GetSubscriptionsFromBiblionumber
-use C4::Search;                # enabled_staff_search_views
+use C4::Biblio qw(
+    GetAuthorisedValueDesc
+    GetBiblioData
+    GetFrameworkCode
+    GetMarcBiblio
+    GetMarcFromKohaField
+    GetMarcStructure
+);
+use C4::Serials qw( CountSubscriptionFromBiblionumber GetSubscription GetSubscriptionsFromBiblionumber );
+use C4::Search qw( z3950_search_args enabled_staff_search_views );
 
 use Koha::Biblios;
 use Koha::BiblioFrameworks;
 use Koha::Patrons;
-use Koha::DateUtils;
+use Koha::DateUtils qw( output_pref );
+use Koha::Virtualshelves;
 
 use List::MoreUtils qw( uniq );
 
-my $query        = new CGI;
+my $query        = CGI->new;
 my $dbh          = C4::Context->dbh;
 my $biblionumber = $query->param('biblionumber');
 $biblionumber = HTML::Entities::encode($biblionumber);
@@ -81,9 +86,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "catalogue/MARCdetail.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
-        debug           => 1,
     }
 );
 
@@ -267,7 +270,6 @@ my %witness
   ; #---- stores the list of subfields used at least once, with the "meaning" of the code
 my @item_subfield_codes;
 my @item_loop;
-my $norequests = 1;
 
 foreach my $field (@fields) {
     next if ( $field->tag() < 10 );
@@ -295,8 +297,6 @@ foreach my $field (@fields) {
             $item->{ $subf[$i][0] } .= GetAuthorisedValueDesc( $field->tag(), $subf[$i][0], $subf[$i][1], '', $tagslib) || $subf[$i][1];
         }
 
-        $norequests = 0 if  $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{kohafield} eq 'items.notforloan' and $subf[$i][1] == 0;
-
         my $kohafield = $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{kohafield};
         $item->{ $subf[$i][0] } = output_pref( { str => $item->{ $subf[$i][0] }, dateonly => 1 } )
           if grep { $kohafield eq $_ }
@@ -329,8 +329,39 @@ if ($subscriptionscount) {
     );
 }
 
+# get biblionumbers stored in the cart
+my @cart_list;
+
+if($query->cookie("intranet_bib_list")){
+    my $cart_list = $query->cookie("intranet_bib_list");
+    @cart_list = split(/\//, $cart_list);
+    if ( grep {$_ eq $biblionumber} @cart_list) {
+        $template->param( incart => 1 );
+    }
+}
+
+my $some_private_shelves = Koha::Virtualshelves->get_some_shelves(
+    {
+        borrowernumber => $loggedinuser,
+        add_allowed    => 1,
+        category       => 1,
+    }
+);
+my $some_public_shelves = Koha::Virtualshelves->get_some_shelves(
+    {
+        borrowernumber => $loggedinuser,
+        add_allowed    => 1,
+        category       => 2,
+    }
+);
+
+
+$template->param(
+    add_to_some_private_shelves => $some_private_shelves,
+    add_to_some_public_shelves  => $some_public_shelves,
+);
+
 $template->param (
-    norequests              => $norequests,
     item_loop               => \@item_loop,
     item_header_loop        => \@item_header_loop,
     item_subfield_codes     => \@item_subfield_codes,
@@ -341,39 +372,10 @@ $template->param (
        z3950_search_params             => C4::Search::z3950_search_args($biblio),
        C4::Search::enabled_staff_search_views,
     searchid                => scalar $query->param('searchid'),
-    biblio                  => $biblio_object->unblessed,
+    biblio                  => $biblio_object,
+    loggedinuser => $loggedinuser,
 );
 
-my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
-my @deletedorders_using_biblio;
-my @orders_using_biblio;
-my @baskets_orders;
-my @baskets_deletedorders;
-
-foreach my $myorder (@allorders_using_biblio) {
-    my $basket = $myorder->{'basketno'};
-    if ((defined $myorder->{'datecancellationprinted'}) and  ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
-        push @deletedorders_using_biblio, $myorder;
-        unless (grep{ $_ eq $basket } @baskets_deletedorders){
-            push @baskets_deletedorders,$myorder->{'basketno'};
-        }
-    }
-    else {
-        push @orders_using_biblio, $myorder;
-        unless (grep { $_ eq $basket } @baskets_orders){
-            push @baskets_orders,$myorder->{'basketno'};
-            }
-    }
-}
-
-my $count_orders_using_biblio = scalar @orders_using_biblio ;
-$template->param (countorders => $count_orders_using_biblio);
-
-my $count_deletedorders_using_biblio = scalar @deletedorders_using_biblio ;
-$template->param (countdeletedorders => $count_deletedorders_using_biblio);
-
-$biblio = Koha::Biblios->find( $biblionumber );
-my $holds = $biblio->holds;
-$template->param( holdcount => $holds->count );
+$template->param( holdcount => $biblio_object->holds->count );
 
 output_html_with_http_headers $query, $cookie, $template->output;