X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-showreviews.pl;h=7a72214bbf5d66c6dcf1fbe99f018e808330cd1e;hb=70d61d80fbf48df4d2a3843ea3349ea77de5fbf8;hp=74f4684ac7ced83fe7f119c822250b6a481d88a2;hpb=d3c02c6bb6bb544136aabc4b5d68db031f192b25;p=srvgit diff --git a/opac/opac-showreviews.pl b/opac/opac-showreviews.pl index 74f4684ac7..7a72214bbf 100755 --- a/opac/opac-showreviews.pl +++ b/opac/opac-showreviews.pl @@ -5,46 +5,48 @@ # # 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. - -use strict; -use warnings; - -use CGI; -use C4::Auth; -use C4::Koha; -use C4::Output; -use C4::Circulation; -use C4::Review; -use C4::Biblio; -use C4::Dates qw/format_date/; -use C4::Members qw/GetMemberDetails/; -use POSIX qw(ceil strftime); +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . + +use Modern::Perl; + +use CGI qw ( -utf8 ); +use C4::Auth qw( get_template_and_user ); +use C4::Koha qw( + GetNormalizedEAN + GetNormalizedISBN + GetNormalizedOCLCNumber + GetNormalizedUPC +); +use C4::Output qw( output_html_with_http_headers ); +use Koha::DateUtils qw( dt_from_string ); +use Koha::Biblios; +use Koha::Patrons; +use Koha::Reviews; +use POSIX qw( ceil floor ); my $template_name; -my $query = new CGI; +my $query = CGI->new; my $format = $query->param("format") || ''; my $count = C4::Context->preference('OPACnumSearchResults') || 20; my $results_per_page = $query->param('count') || $count; my $offset = $query->param('offset') || 0; -my $page = $query->param('page') || 1; -$offset = ($page-1)*$results_per_page if $page>1; +my $page = floor( $offset / $results_per_page ) + 1; if ($format eq "rss") { - $template_name = "opac-showreviews-rss.tmpl"; + $template_name = "opac-showreviews-rss.tt"; } else { - $template_name = "opac-showreviews.tmpl", + $template_name = "opac-showreviews.tt", } my ( $template, $borrowernumber, $cookie ) = &get_template_and_user( @@ -57,8 +59,8 @@ my ( $template, $borrowernumber, $cookie ) = &get_template_and_user( ); if($format eq "rss"){ - my $lastbuilddate = C4::Dates->new(); - my $lastbuilddate_output = $lastbuilddate->output("rfc822"); + my $lastbuilddate = dt_from_string; + my $lastbuilddate_output = $lastbuilddate->strftime("%a, %d %b %Y %H:%M:%S %z"); $template->param( rss => 1, timestamp => $lastbuilddate_output @@ -76,48 +78,62 @@ if ( C4::Context->preference('ShowReviewer') and C4::Context->preference('ShowRe } } -my $reviews = getallreviews(1,$offset,$results_per_page); +my $reviews = Koha::Reviews->search( + { approved => 1 }, + { + rows => $results_per_page, + page => $page, + order_by => { -desc => 'datereviewed' }, + } +)->unblessed; my $marcflavour = C4::Context->preference("marcflavour"); -my $hits = numberofreviews(1); +my $hits = Koha::Reviews->search({ approved => 1 })->count; my $i = 0; -my $latest_comment_date; for my $result (@$reviews){ my $biblionumber = $result->{biblionumber}; - my $bib = &GetBiblioData($biblionumber); - my $record = GetMarcBiblio($biblionumber); - my $frameworkcode = GetFrameworkCode($biblionumber); - my ( $borr ) = GetMemberDetails( $result->{borrowernumber} ); + my $biblio = Koha::Biblios->find( $biblionumber ); + my $biblioitem = $biblio->biblioitem; + my $record = $biblio->metadata->record; $result->{normalized_upc} = GetNormalizedUPC($record,$marcflavour); $result->{normalized_ean} = GetNormalizedEAN($record,$marcflavour); $result->{normalized_oclc} = GetNormalizedOCLCNumber($record,$marcflavour); $result->{normalized_isbn} = GetNormalizedISBN(undef,$record,$marcflavour); - $result->{title} = $bib->{'title'}; - $result->{subtitle} = GetRecordValue('subtitle', $record, $frameworkcode); - $result->{author} = $bib->{'author'}; - $result->{place} = $bib->{'place'}; - $result->{publishercode} = $bib->{'publishercode'}; - $result->{copyrightdate} = $bib->{'copyrightdate'}; - $result->{pages} = $bib->{'pages'}; - $result->{size} = $bib->{'size'}; - $result->{notes} = $bib->{'notes'}; - $result->{timestamp} = $bib->{'timestamp'}; - $result->{firstname} = $borr->{'firstname'}; - $result->{surname} = $borr->{'surname'}; - if ($libravatar_enabled and $borr->{'email'}) { - $result->{avatarurl} = libravatar_url(email => $borr->{'email'}, size => 40, https => $ENV{HTTPS}); - } + $result->{title} = $biblio->title; + $result->{subtitle} = $biblio->subtitle; + $result->{medium} = $biblio->medium; + $result->{part_number} = $biblio->part_number; + $result->{part_name} = $biblio->part_name; + $result->{author} = $biblio->author; + $result->{place} = $biblioitem->place; + $result->{publishercode} = $biblioitem->publishercode; + $result->{copyrightdate} = $biblio->copyrightdate; + $result->{pages} = $biblioitem->pages; + $result->{size} = $biblioitem->size; + $result->{notes} = $biblioitem->notes; + $result->{timestamp} = $biblioitem->timestamp; - if ($result->{borrowernumber} eq $borrowernumber) { - $result->{your_comment} = 1; - } + $result->{biblio_object} = $biblio; # TODO Use this variable directly in the template + + my $patron = Koha::Patrons->find( $result->{borrowernumber} ); + if ( $patron ) { + $result->{borrtitle} = $patron->title; + $result->{firstname} = $patron->firstname; + $result->{surname} = $patron->surname; + $result->{userid} = $patron->userid; + if ($libravatar_enabled and $patron->email) { + $result->{avatarurl} = libravatar_url(email => $patron->email, size => 40, https => $ENV{HTTPS}); + } + + if ($result->{borrowernumber} eq $borrowernumber) { + $result->{your_comment} = 1; + } + } if($format eq "rss"){ - my $rsstimestamp = C4::Dates->new($result->{datereviewed},"iso"); - my $rsstimestamp_output = $rsstimestamp->output("rfc822"); + my $rsstimestamp = eval { dt_from_string( $result->{datereviewed} ); }; + $rsstimestamp = dt_from_string unless ( $rsstimestamp ); #default to today if something went wrong + my $rsstimestamp_output = $rsstimestamp->strftime("%a, %d %b %Y %H:%M:%S %z"); $result->{timestamp} = $rsstimestamp_output; - $result->{datereviewed} = format_date($result->{datereviewed}); - } else { - $result->{datereviewed} = format_date($result->{datereviewed}); } } ## Build the page numbers on the bottom of the page @@ -147,7 +163,8 @@ for my $result (@$reviews){ # the page number for this page my $this_page_number = $i; # it should only be highlighted if it's the current page - my $highlight = 1 if ($this_page_number == $current_page_number); + my $highlight; + $highlight = 1 if ($this_page_number == $current_page_number); # put it in the array push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight }; @@ -159,7 +176,8 @@ for my $result (@$reviews){ for ($i=$current_page_number; $i<=($current_page_number + 20 );$i++) { my $this_offset = ((($i-9)*$results_per_page)-$results_per_page); my $this_page_number = $i-9; - my $highlight = 1 if ($this_page_number == $current_page_number); + my $highlight; + $highlight = 1 if ($this_page_number == $current_page_number); if ($this_page_number <= $pages) { push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight }; } @@ -172,6 +190,7 @@ $template->param(next_page_offset => $next_page_offset) unless $pages eq $curren $template->param( reviews => $reviews, + results_per_page => $results_per_page, ); output_html_with_http_headers $query, $cookie, $template->output;