Bug 26133: Remove GetMarc* calls in detail.pl

[koha-ffzg.git] / catalogue / MARCdetail.pl

diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl
index 8940471..44bc8d0 100755 (executable)
--- a/catalogue/MARCdetail.pl
+++ b/catalogue/MARCdetail.pl
@@ -61,6 +61,7 @@ use C4::Search;               # enabled_staff_search_views
 use Koha::Biblios;
 use Koha::BiblioFrameworks;
 use Koha::Patrons;
+use Koha::DateUtils;
 
 use List::MoreUtils qw( uniq );
 
@@ -68,8 +69,7 @@ my $query        = new CGI;
 my $dbh          = C4::Context->dbh;
 my $biblionumber = $query->param('biblionumber');
 $biblionumber = HTML::Entities::encode($biblionumber);
-my $frameworkcode = $query->param('frameworkcode');
-$frameworkcode = GetFrameworkCode( $biblionumber ) unless ($frameworkcode);
+my $frameworkcode = $query->param('frameworkcode') // GetFrameworkCode( $biblionumber );
 my $popup        =
   $query->param('popup')
   ;    # if set to 1, then don't insert links, it's just to show the biblio
@@ -90,7 +90,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 my $record = GetMarcBiblio({
     biblionumber => $biblionumber,
     embed_items  => 1 });
-$template->param( ocoins => GetCOinSBiblio($record) );
 
 if ( not defined $record ) {
     # biblionumber invalid -> report and exit
@@ -115,6 +114,16 @@ if($query->cookie("holdfor")){
     );
 }
 
+if( $query->cookie("searchToOrder") ){
+    my ( $basketno, $vendorid ) = split( /\//, $query->cookie("searchToOrder") );
+    $template->param(
+        searchtoorder_basketno => $basketno,
+        searchtoorder_vendorid => $vendorid
+    );
+}
+
+$template->param( ocoins => $biblio_object->get_coins );
+
 #count of item linked
 my $itemcount = $biblio_object->items->count;
 $template->param( count => $itemcount,
@@ -259,6 +268,7 @@ my %witness
 my @item_subfield_codes;
 my @item_loop;
 my $norequests = 1;
+
 foreach my $field (@fields) {
     next if ( $field->tag() < 10 );
     my @subf = $field->subfields;
@@ -268,17 +278,34 @@ foreach my $field (@fields) {
     for my $i ( 0 .. $#subf ) {
         next if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{tab} ne 10 );
         next if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{hidden} =~ /-7|-4|-3|-2|2|3|5|8/);
+
         push @item_subfield_codes, $subf[$i][0];
         $witness{ $subf[$i][0] } =
         $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{lib};
-        $item->{ $subf[$i][0] } = GetAuthorisedValueDesc( $field->tag(),
-                        $subf[$i][0], $subf[$i][1], '', $tagslib) || $subf[$i][1];
-        $norequests = 0 if $subf[$i][1] ==0 and $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{kohafield} eq 'items.notforloan';
+
+        # Allow repeatables (BZ 13574)
+        if( $item->{$subf[$i][0]}) {
+            $item->{$subf[$i][0]} .= ' | ';
+        } else {
+            $item->{$subf[$i][0]} = q{};
+        }
+        if( $tagslib->{$field->tag()}->{$subf[$i][0]}->{isurl} ) {
+            $item->{$subf[$i][0]} .= "<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+        } else {
+            $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 $_ }
+              qw( items.dateaccessioned items.onloan items.datelastseen items.datelastborrowed items.replacementpricedate );
     }
     push @item_loop, $item if $item;
 }
 
-my ($holdingbrtagf,$holdingbrtagsubf) = &GetMarcFromKohaField("items.holdingbranch",$frameworkcode);
+my ($holdingbrtagf,$holdingbrtagsubf) = &GetMarcFromKohaField( "items.holdingbranch" );
 @item_loop = sort {$a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf}} @item_loop;
 
 @item_subfield_codes = uniq @item_subfield_codes;
@@ -313,7 +340,8 @@ $template->param (
        marcview => 1,
        z3950_search_params             => C4::Search::z3950_search_args($biblio),
        C4::Search::enabled_staff_search_views,
-    searchid            => scalar $query->param('searchid'),
+    searchid                => scalar $query->param('searchid'),
+    biblio                  => $biblio_object->unblessed,
 );
 
 my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
@@ -326,13 +354,13 @@ 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(/^$basket$/, @baskets_deletedorders)){
+        unless (grep{ $_ eq $basket } @baskets_deletedorders){
             push @baskets_deletedorders,$myorder->{'basketno'};
         }
     }
     else {
         push @orders_using_biblio, $myorder;
-        unless (grep(/^$basket$/, @baskets_orders)){
+        unless (grep { $_ eq $basket } @baskets_orders){
             push @baskets_orders,$myorder->{'basketno'};
             }
     }