X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-readingrecord.pl;h=00c7c436d8361f40bb9ed40561cffa59de942828;hb=4ea26c0a697fcd8e4f88feb9a4f43a8b02c06650;hp=0c92de633b384486eb18a5089b5587c9ff3ea3fe;hpb=374b6f4b9f33a776d04cdaa696b40e8e033dda32;p=srvgit diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl index 0c92de633b..00c7c436d8 100755 --- a/opac/opac-readingrecord.pl +++ b/opac/opac-readingrecord.pl @@ -2,24 +2,23 @@ # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; -use CGI; +use CGI qw ( -utf8 ); use C4::Auth; use C4::Koha; @@ -27,88 +26,107 @@ use C4::Biblio; use C4::Circulation; use C4::Members; use Koha::DateUtils; +use MARC::Record; use C4::Output; +use C4::Charset qw(StripNonXmlChars); +use Koha::Patrons; + +use Koha::ItemTypes; +use Koha::Ratings; my $query = new CGI; + +# if opacreadinghistory is disabled, leave immediately +if ( ! C4::Context->preference('opacreadinghistory') ) { + print $query->redirect("/cgi-bin/koha/errors/404.pl"); + exit; +} + my ( $template, $borrowernumber, $cookie ) = get_template_and_user( { - template_name => "opac-readingrecord.tmpl", + template_name => "opac-readingrecord.tt", query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, debug => 1, } ); -# get borrower information .... -my ( $borr ) = GetMemberDetails( $borrowernumber ); +my $borr = Koha::Patrons->find( $borrowernumber )->unblessed; $template->param(%{$borr}); -my $itemtypes = GetItemTypes(); +my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } }; # get the record -my $order = $query->param('order') || ''; -if ( $order eq '' ) { - $order = "date_due desc"; - $template->param( orderbydate => 1 ); -} - +my $order = $query->param('order') || ''; if ( $order eq 'title' ) { $template->param( orderbytitle => 1 ); } - -if ( $order eq 'author' ) { +elsif ( $order eq 'author' ) { $template->param( orderbyauthor => 1 ); } - -my $limit = $query->param('limit') || 50; -if ( $limit eq 'full' ) { - $limit = 0; -} else { - $limit = 50; + $order = "date_due desc"; + $template->param( orderbydate => 1 ); } -my ( $issues ) = GetAllIssues( $borrowernumber, $order, $limit ); - - -my @loop_reading; - -foreach my $issue (@{$issues} ) { - my %line; - - my $record = GetMarcBiblio($issue->{'biblionumber'}); - - # XISBN Stuff - my $isbn = GetNormalizedISBN($issue->{'isbn'}); - $line{normalized_isbn} = $isbn; - $line{biblionumber} = $issue->{'biblionumber'}; - $line{title} = $issue->{'title'}; - $line{author} = $issue->{'author'}; - $line{itemcallnumber} = $issue->{'itemcallnumber'}; - $line{date_due} = $issue->{'date_due'}; - $line{returndate} = $issue->{'returndate'}; - $line{volumeddesc} = $issue->{'volumeddesc'}; - $issue->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $issue->{'itype'} : $issue->{'itemtype'}; - if($issue->{'itemtype'}) { - $line{'description'} = $itemtypes->{ $issue->{'itemtype'} }->{'description'}; - $line{imageurl} = getitemtypeimagelocation( 'opac', $itemtypes->{ $issue->{'itemtype'} }->{'imageurl'} ); + +my $limit = $query->param('limit'); +$limit //= ''; +$limit = ( $limit eq 'full' ) ? 0 : 50; + +my $issues = GetAllIssues( $borrowernumber, $order, $limit ); + +my $itype_attribute = + ( C4::Context->preference('item-level_itypes') ) ? 'itype' : 'itemtype'; + +my $opac_summary_html = C4::Context->preference('OPACMySummaryHTML'); +foreach my $issue ( @{$issues} ) { + $issue->{normalized_isbn} = GetNormalizedISBN( $issue->{isbn} ); + if ( $issue->{$itype_attribute} ) { + $issue->{translated_description} = + $itemtypes->{ $issue->{$itype_attribute} }->{translated_description}; + $issue->{imageurl} = + getitemtypeimagelocation( 'opac', + $itemtypes->{ $issue->{$itype_attribute} }->{imageurl} ); + } + my $marcxml = C4::Biblio::GetXmlBiblio( $issue->{biblionumber} ); + if ( $marcxml ) { + $marcxml = StripNonXmlChars( $marcxml ); + my $marc_rec = + MARC::Record::new_from_xml( $marcxml, 'utf8', + C4::Context->preference('marcflavour') ); + $issue->{subtitle} = GetRecordValue( 'subtitle', $marc_rec ); + $issue->{normalized_upc} = GetNormalizedUPC( $marc_rec, C4::Context->preference('marcflavour') ); } # My Summary HTML - if (my $my_summary_html = C4::Context->preference('OPACMySummaryHTML')){ - $line{author} ? $my_summary_html =~ s/{AUTHOR}/$line{author}/g : $my_summary_html =~ s/{AUTHOR}//g; - $line{title} =~ s/\/+$//; # remove trailing slash - $line{title} =~ s/\s+$//; # remove trailing space - $line{title} ? $my_summary_html =~ s/{TITLE}/$line{title}/g : $my_summary_html =~ s/{TITLE}//g; - $line{normalized_isbn} ? $my_summary_html =~ s/{ISBN}/$line{normalized_isbn}/g : $my_summary_html =~ s/{ISBN}//g; - $line{biblionumber} ? $my_summary_html =~ s/{BIBLIONUMBER}/$line{biblionumber}/g : $my_summary_html =~ s/{BIBLIONUMBER}//g; - $line{MySummaryHTML} = $my_summary_html; + if ($opac_summary_html) { + my $my_summary_html = $opac_summary_html; + $issue->{author} + ? $my_summary_html =~ s/{AUTHOR}/$issue->{author}/g + : $my_summary_html =~ s/{AUTHOR}//g; + my $title = $issue->{title}; + $title =~ s/\/+$//; # remove trailing slash + $title =~ s/\s+$//; # remove trailing space + $title + ? $my_summary_html =~ s/{TITLE}/$title/g + : $my_summary_html =~ s/{TITLE}//g; + $issue->{normalized_isbn} + ? $my_summary_html =~ s/{ISBN}/$issue->{normalized_isbn}/g + : $my_summary_html =~ s/{ISBN}//g; + $issue->{biblionumber} + ? $my_summary_html =~ s/{BIBLIONUMBER}/$issue->{biblionumber}/g + : $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; } - push( @loop_reading, \%line ); - $line{subtitle} = GetRecordValue('subtitle', $record, GetFrameworkCode($issue->{'biblionumber'})); } if (C4::Context->preference('BakerTaylorEnabled')) { @@ -128,19 +146,17 @@ BEGIN { } } -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); } $template->param( - READING_RECORD => \@loop_reading, + READING_RECORD => $issues, limit => $limit, - showfulllink => 1, - readingrecview => 1, - count => scalar @loop_reading, - OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0, + readingrecview => 1, + OPACMySummaryHTML => $opac_summary_html ? 1 : 0, ); -output_html_with_http_headers $query, $cookie, $template->output; +output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };