Revision to my earlier patch for displaying the user name on checked-out items

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

diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 3e032de..679a48b 100755 (executable)
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -107,6 +107,7 @@ foreach my $subscription (@subscriptions) {
     $cell{subscriptionid}    = $subscription->{subscriptionid};
     $cell{subscriptionnotes} = $subscription->{notes};
     $cell{branchcode}        = $subscription->{branchcode};
+    $cell{branchname}        = GetBranchName($subscription->{branchcode});
     $cell{hasalert}          = $subscription->{hasalert};
     #get the three latest serials.
     $serials_to_display = $subscription->{opacdisplaycount};
@@ -224,13 +225,8 @@ $template->param(
 );
 
 # COinS format FIXME: for books Only
-my $coins_format;
-my $fmt = substr $record->leader(), 6,2;
-my $fmts;
-$fmts->{'am'} = 'book';
-$coins_format = $fmts->{$fmt};
 $template->param(
-       ocoins_format => $coins_format,
+    ocoins => GetCOinSBiblio($biblionumber),
 );
 
 my $reviews = getreviews( $biblionumber, 1 );
@@ -242,6 +238,7 @@ foreach ( @$reviews ) {
     $_->{surname}   = $borrowerData->{'surname'};
     $_->{firstname} = $borrowerData->{'firstname'};
     $_->{userid}    = $borrowerData->{'userid'};
+    $_->{cardnumber}    = $borrowerData->{'cardnumber'};
     $_->{datereviewed} = format_date($_->{datereviewed});
     if ($borrowerData->{'borrowernumber'} eq $borrowernumber) {
                $_->{your_comment} = 1;
@@ -290,7 +287,7 @@ if ( C4::Context->preference("OPACAmazonEnabled") ) {
     my $amazon_details = &get_amazon_details( $isbn, $record, $marcflavour, \@services );
     my $similar_products_exist;
     if ( $amazon_reviews ) {
-        my $item = $amazon_details->{Items}->{Item};
+        my $item = $amazon_details->{Items}->{Item}->[0];
         my $customer_reviews = \@{ $item->{CustomerReviews}->{Review} };
         for my $one_review ( @$customer_reviews ) {
             $one_review->{Date} = format_date($one_review->{Date});
@@ -302,7 +299,7 @@ if ( C4::Context->preference("OPACAmazonEnabled") ) {
         $template->param( AMAZON_EDITORIAL_REVIEWS => $editorial_reviews );
     }
     if ( $amazon_similars ) {
-        my $item = $amazon_details->{Items}->{Item};
+        my $item = $amazon_details->{Items}->{Item}->[0];
         my @similar_products;
         for my $similar_product (@{ $item->{SimilarProducts}->{SimilarProduct} }) {
             # do we have any of these isbns in our collection?
@@ -333,8 +330,7 @@ if ( C4::Context->preference("SyndeticsEnabled") ) {
 
 if ( C4::Context->preference("SyndeticsEnabled")
         && C4::Context->preference("SyndeticsSummary")
-        && (    $syndetics_elements->{'SUMMARY'}   =~ /SUMMARY/
-             || $syndetics_elements->{'AVSUMMARY'} =~ /AVSUMMARY/ ) ) {
+        && ( exists($syndetics_elements->{'SUMMARY'}) || exists($syndetics_elements->{'AVSUMMARY'}) ) ) {
        eval {
        my $syndetics_summary = &get_syndetics_summary($isbn,$upc,$oclc, $syndetics_elements);
        $template->param( SYNDETICS_SUMMARY => $syndetics_summary );
@@ -345,7 +341,7 @@ if ( C4::Context->preference("SyndeticsEnabled")
 
 if ( C4::Context->preference("SyndeticsEnabled")
         && C4::Context->preference("SyndeticsTOC")
-        && $syndetics_elements->{'TOC'} =~ /TOC/) {
+        && exists($syndetics_elements->{'TOC'}) ) {
        eval {
     my $syndetics_toc = &get_syndetics_toc($isbn,$upc,$oclc);
     $template->param( SYNDETICS_TOC => $syndetics_toc );
@@ -355,7 +351,7 @@ if ( C4::Context->preference("SyndeticsEnabled")
 
 if ( C4::Context->preference("SyndeticsEnabled")
     && C4::Context->preference("SyndeticsExcerpt")
-    && $syndetics_elements->{'DBCHAPTER'} =~ /DBCHAPTER/ ) {
+    && exists($syndetics_elements->{'DBCHAPTER'}) ) {
     eval {
     my $syndetics_excerpt = &get_syndetics_excerpt($isbn,$upc,$oclc);
     $template->param( SYNDETICS_EXCERPT => $syndetics_excerpt );
@@ -374,7 +370,7 @@ if ( C4::Context->preference("SyndeticsEnabled")
 
 if ( C4::Context->preference("SyndeticsEnabled")
     && C4::Context->preference("SyndeticsAuthorNotes")
-       && $syndetics_elements->{'ANOTES'} =~ /ANOTES/ ) {
+       && exists($syndetics_elements->{'ANOTES'}) ) {
     eval {
     my $syndetics_anotes = &get_syndetics_anotes($isbn,$upc,$oclc);
     $template->param( SYNDETICS_ANOTES => $syndetics_anotes );