X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-readingrecord.pl;h=4f16c66398d8924bc1a65f02d381ae7c7edcbbc7;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=7a9abbea3def0169308b01df3619df2232525c44;hpb=c80b328aaeec50a765c6a127e422ac41ceca629a;p=koha_fer diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl index 7a9abbea3d..4f16c66398 100755 --- a/opac/opac-readingrecord.pl +++ b/opac/opac-readingrecord.pl @@ -11,22 +11,26 @@ # 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., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# 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; -require Exporter; +use warnings; + use CGI; use C4::Auth; use C4::Koha; +use C4::Biblio; use C4::Circulation; -use C4::Dates qw/format_date/; use C4::Members; +use Koha::DateUtils; +use MARC::Record; use C4::Output; +use C4::Charset qw(StripNonXmlChars); my $query = new CGI; my ( $template, $borrowernumber, $cookie ) = get_template_and_user( @@ -43,81 +47,70 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( # get borrower information .... my ( $borr ) = GetMemberDetails( $borrowernumber ); -$template->param($borr); +$template->param(%{$borr}); -my $imgdir = getitemtypeimagesrc(); my $itemtypes = GetItemTypes(); # get the record -my $order = $query->param('order'); -my $order2 = $order; -if ( $order2 eq '' ) { - $order2 = "date_due desc"; - $template->param( orderbydate => 1 ); -} - -if ( $order2 eq 'title' ) { +my $order = $query->param('order') || ''; +if ( $order eq 'title' ) { $template->param( orderbytitle => 1 ); } - -if ( $order2 eq 'author' ) { +elsif ( $order eq 'author' ) { $template->param( orderbyauthor => 1 ); } - -my $limit = $query->param('limit'); -if ( $limit eq 'full' ) { - $limit = 0; -} else { - $limit = 50; + $order = "date_due desc"; + $template->param( orderbydate => 1 ); } -my ( $count, $issues ) = GetAllIssues( $borrowernumber, $order2, $limit ); - -# add the row parity -#my $num = 0; -#foreach my $row (@$issues) { -# $row->{'even'} = 1 if $num % 2 == 0; -# $row->{'odd'} = 1 if $num % 2 == 1; -# $num++; -#} -my @loop_reading; - -for ( my $i = 0 ; $i < $count ; $i++ ) { - my %line; - if ( $i % 2 ) { - $line{'toggle'} = 1; +my $limit = $query->param('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->{description} = + $itemtypes->{ $issue->{$itype_attribute} }->{description}; + $issue->{imageurl} = + getitemtypeimagelocation( 'opac', + $itemtypes->{ $issue->{$itype_attribute} }->{imageurl} ); + } + if ( $issue->{marcxml} ) { + my $marcxml = StripNonXmlChars( $issue->{marcxml} ); + my $marc_rec = + MARC::Record::new_from_xml( $marcxml, 'utf8', + C4::Context->preference('marcflavour') ); + $issue->{subtitle} = + GetRecordValue( 'subtitle', $marc_rec, $issue->{frameworkcode} ); + } + # 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; } - - # XISBN Stuff - my $xisbn=$issues->[$i]->{'isbn'}; - $xisbn =~ /(\d*[X]*)/; - $line{amazonisbn} = $1; # FIXME: so it is OK if the ISBN = 'XXXXX' ? - my ($clean, $amazonisbn); - $amazonisbn = $1; - # these might be overkill, but they are better than the regexp above. - if ( - $amazonisbn =~ /\b(\d{13})\b/ or - $amazonisbn =~ /\b(\d{10})\b/ or - $amazonisbn =~ /\b(\d{9}X)\b/i - ) { - $clean = $1; - $line{clean_isbn} = $1; - } - - $line{biblionumber} = $issues->[$i]->{'biblionumber'}; - $line{title} = $issues->[$i]->{'title'}; - $line{author} = $issues->[$i]->{'author'}; - $line{isbn} = $issues->[$i]->{'isbn'}; - $line{itemcallnumber} = $issues->[$i]->{'itemcallnumber'}; - $line{date_due} = format_date( $issues->[$i]->{'date_due'} ); - $line{returndate} = format_date( $issues->[$i]->{'returndate'} ); - $line{volumeddesc} = $issues->[$i]->{'volumeddesc'}; - $line{counter} = $i + 1; - $line{'description'} = $itemtypes->{ $issues->[$i]->{'itemtype'} }->{'description'}; - $line{imageurl} = $imgdir."/".$itemtypes->{ $issues->[$i]->{'itemtype'} }->{'imageurl'}; - push( @loop_reading, \%line ); } if (C4::Context->preference('BakerTaylorEnabled')) { @@ -137,19 +130,18 @@ BEGIN { } } -for(qw(AmazonContent 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( - count => $count, - READING_RECORD => \@loop_reading, + READING_RECORD => $issues, limit => $limit, showfulllink => 1, - readingrecview => 1 + readingrecview => 1, + OPACMySummaryHTML => $opac_summary_html ? 1 : 0, ); output_html_with_http_headers $query, $cookie, $template->output; -