Bug 27855: Implement Koha::Patron::Attribute->to_api_mapping

[srvgit] / opac / opac-MARCdetail.pl

diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index 4867eda..39cb10e 100755 (executable)
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -58,11 +58,12 @@ use C4::Acquisition;
 use C4::Koha;
 use List::MoreUtils qw( any uniq );
 use Koha::Biblios;
-use Koha::IssuingRules;
+use Koha::CirculationRules;
 use Koha::Items;
 use Koha::ItemTypes;
 use Koha::Patrons;
 use Koha::RecordProcessor;
+use Koha::DateUtils;
 
 my $query = CGI->new();
 
@@ -105,7 +106,7 @@ my @all_items = GetItemsInfo($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 ($tag_itemnumber,$subtag_itemnumber) = &GetMarcFromKohaField( 'items.itemnumber' );
 my @nonhiddenitems = $record->field($tag_itemnumber);
 if (scalar @all_items >= 1 && scalar @nonhiddenitems == 0) {
     print $query->redirect("/cgi-bin/koha/errors/404.pl");
@@ -129,7 +130,7 @@ if(my $cart_list = $query->cookie("bib_list")){
     }
 }
 
-my ($bt_tag,$bt_subtag) = GetMarcFromKohaField('biblio.title',$framework);
+my ($bt_tag,$bt_subtag) = GetMarcFromKohaField( 'biblio.title' );
 $template->param(
     bibliotitle => $biblio->title,
 ) if $tagslib->{$bt_tag}->{$bt_subtag}->{hidden} <= 0 && # <=0 OPAC visible.
@@ -138,7 +139,7 @@ $template->param(
 my $allow_onshelf_holds;
 for my $itm (@all_items) {
     my $item = Koha::Items->find( $itm->{itemnumber} );
-    $allow_onshelf_holds = Koha::IssuingRules->get_onshelfholds_policy( { item => $item, patron => $patron } );
+    $allow_onshelf_holds = Koha::CirculationRules->get_onshelfholds_policy( { item => $item, patron => $patron } );
     last if $allow_onshelf_holds;
 }
 
@@ -154,7 +155,6 @@ if (C4::Context->preference("RequestOnOpac")) {
 
 # fill arrays
 my @loop_data = ();
-my $tag;
 
 # loop through each tab 0 through 9
 for ( my $tabloop = 0 ; $tabloop <= 9 ; $tabloop++ ) {
@@ -290,24 +290,38 @@ foreach my $field (@fields) {
         my $sf_def = $tagslib->{ $field->tag() }->{ $subf[$i][0] };
         next if ( ($sf_def->{tab}||0) != 10 );
         next if ( ($sf_def->{hidden}||0) > 0 );
+
         push @item_subfield_codes, $subf[$i][0];
         $witness{ $subf[$i][0] } = $sf_def->{lib};
 
+        # Allow repeatables (BZ 13574)
+        if( $item->{$subf[$i][0]} ) {
+            $item->{$subf[$i][0]} .= ' | ';
+        } else {
+            $item->{$subf[$i][0]} = q{};
+        }
+
         if ( $sf_def->{isurl} ) {
-            $item->{ $subf[$i][0] } = "<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+            $item->{ $subf[$i][0] } .= "<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
         }
         elsif ( $sf_def->{kohafield} eq "biblioitems.isbn" ) {
-            $item->{ $subf[$i][0] } = $subf[$i][1];
+            $item->{ $subf[$i][0] } .= $subf[$i][1];
         }
         else {
-            $item->{ $subf[$i][0] } = GetAuthorisedValueDesc( $field->tag(), $subf[$i][0],
+            $item->{ $subf[$i][0] } .= GetAuthorisedValueDesc( $field->tag(), $subf[$i][0],
                 $subf[$i][1], '', $tagslib, '', 'opac' );
         }
+
+        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", $framework );
+  &GetMarcFromKohaField( "items.holdingbranch" );
 @item_loop =
   sort { ($a->{$holdingbrtagsubf}||'') cmp ($b->{$holdingbrtagsubf}||'') } @item_loop;
 
@@ -351,9 +365,12 @@ if (my $search_for_title = C4::Context->preference('OPACSearchForTitleIn')){
 }
 
 if( C4::Context->preference('ArticleRequests') ) {
+    my $itemtype = Koha::ItemTypes->find($biblio->itemtype);
     my $artreqpossible = $patron
         ? $biblio->can_article_request( $patron )
-        : Koha::ItemTypes->find($biblio->itemtype)->may_article_request;
+        : $itemtype
+        ? $itemtype->may_article_request
+        : q{};
     $template->param( artreqpossible => $artreqpossible );
 }