Bug 32336: (QA follow-up) Use $metadata->schema

[srvgit] / opac / opac-readingrecord.pl

diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index ca37612..5598148 100755 (executable)
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -16,23 +16,29 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 
-use C4::Auth;
-use C4::Koha;
+use C4::Auth qw( get_template_and_user );
+use C4::Koha qw(
+    getitemtypeimagelocation
+    GetNormalizedISBN
+    GetNormalizedUPC
+);
 use C4::Biblio;
-use C4::Circulation;
-use C4::Members;
-use Koha::DateUtils;
+use C4::Members qw( GetAllIssues );
+use C4::External::BakerTaylor qw( image_url link_url );
 use MARC::Record;
 
-use C4::Output;
-use C4::Charset qw(StripNonXmlChars);
+use C4::Output qw( output_html_with_http_headers );
+use C4::Charset qw( StripNonXmlChars );
+use Koha::Patrons;
+
+use Koha::ItemTypes;
+use Koha::Ratings;
 
-my $query = new CGI;
+my $query = CGI->new;
 
 # if opacreadinghistory is disabled, leave immediately
 if ( ! C4::Context->preference('opacreadinghistory') ) {
@@ -45,17 +51,10 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-readingrecord.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
-        debug           => 1,
     }
 );
 
-# get borrower information ....
-my ( $borr ) = GetMemberDetails( $borrowernumber );
-
-$template->param(%{$borr});
-
-my $itemtypes = GetItemTypes();
+my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
 
 # get the record
 my $order = $query->param('order') || '';
@@ -90,13 +89,12 @@ foreach my $issue ( @{$issues} ) {
           getitemtypeimagelocation( 'opac',
             $itemtypes->{ $issue->{$itype_attribute} }->{imageurl} );
     }
-    if ( $issue->{marcxml} ) {
-        my $marcxml = StripNonXmlChars( $issue->{marcxml} );
+    my $marcxml = C4::Biblio::GetXmlBiblio( $issue->{biblionumber} );
+    if ( $marcxml ) {
+        $marcxml = StripNonXmlChars( $marcxml );
         my $marc_rec =
-          MARC::Record::new_from_xml( $marcxml, 'utf8',
+          MARC::Record::new_from_xml( $marcxml, 'UTF-8',
             C4::Context->preference('marcflavour') );
-        $issue->{subtitle} =
-          GetRecordValue( 'subtitle', $marc_rec, $issue->{frameworkcode} );
         $issue->{normalized_upc} = GetNormalizedUPC( $marc_rec, C4::Context->preference('marcflavour') );
     }
     # My Summary HTML
@@ -119,6 +117,12 @@ foreach my $issue ( @{$issues} ) {
           : $my_summary_html =~ s/{BIBLIONUMBER}//g;
         $issue->{MySummaryHTML} = $my_summary_html;
     }
+    # Star ratings
+    if ( C4::Context->preference('OpacStarRatings') eq 'all' ) {
+        my $ratings = Koha::Ratings->search({ biblionumber => $issue->{biblionumber} });
+        $issue->{ratings} = $ratings;
+        $issue->{my_rating} = $borrowernumber ? $ratings->search({ borrowernumber => $borrowernumber })->next : undef;
+    }
 }
 
 if (C4::Context->preference('BakerTaylorEnabled')) {
@@ -131,19 +135,18 @@ if (C4::Context->preference('BakerTaylorEnabled')) {
        );
 }
 
-BEGIN {
-       if (C4::Context->preference('BakerTaylorEnabled')) {
-               require C4::External::BakerTaylor;
-               import C4::External::BakerTaylor qw(&image_url &link_url);
-       }
-}
-
-for(qw(AmazonCoverImages GoogleJackets)) {     # BakerTaylorEnabled handled above
+for(qw(AmazonCoverImages GoogleJackets)) { # BakerTaylorEnabled handled above
        C4::Context->preference($_) or next;
        $template->param($_=>1);
        $template->param(JacketImages=>1);
 }
 
+my $saving_display = C4::Context->preference('OPACShowSavings');
+if ( $saving_display =~ /checkouthistory/ ) {
+    my $patron = Koha::Patrons->find( $borrowernumber );
+    $template->param( savings => $patron->get_savings );
+}
+
 $template->param(
     READING_RECORD => $issues,
     limit          => $limit,