X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-readingrecord.pl;h=3e78c9a29b0769601ec827a603cbfc3f62509bd0;hb=ac61b4df51586d292f7c0cd54badb8bbbe31c55a;hp=1604585843bc2045eda8c6b6cd5d18b7dd532cba;hpb=c52e5b61dd0a7e0679c912cf50e57835bbe44771;p=koha_fer

diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 1604585843..3e78c9a29b 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -1,91 +1,135 @@
 #!/usr/bin/perl
+
+# 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 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;
-require Exporter;
+use warnings;
+
 use CGI;
 
 use C4::Auth;
 use C4::Koha;
-use C4::Circulation::Circ2;
-use C4::Date;
-use C4::Search;
-use HTML::Template;
-use C4::Interface::CGI::Output;
+use C4::Biblio;
+use C4::Circulation;
+use C4::Members;
+use Koha::DateUtils;
+
+use C4::Output;
 
 my $query = new CGI;
-my ($template, $borrowernumber, $cookie) 
-    = get_template_and_user({template_name => "opac-readingrecord.tmpl",
-			     query => $query,
-			     type => "opac",
-			     authnotrequired => 0,
-			     flagsrequired => {borrow => 1},
-			     debug => 1,
-			     });
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "opac-readingrecord.tmpl",
+        query           => $query,
+        type            => "opac",
+        authnotrequired => 0,
+        flagsrequired   => { borrow => 1 },
+        debug           => 1,
+    }
+);
 
 # get borrower information ....
-my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
+my ( $borr ) = GetMemberDetails( $borrowernumber );
 
+$template->param(%{$borr});
 
-$template->param($borr);
+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);
+my $order  = $query->param('order') || '';
+if ( $order eq '' ) {
+    $order = "date_due desc";
+    $template->param( orderbydate => 1 );
 }
 
-if($order2 eq 'title'){
-	$template->param(orderbytitle => 1);
-	}
+if ( $order eq 'title' ) {
+    $template->param( orderbytitle => 1 );
+}
 
-if($order2 eq 'author'){
-	$template->param(orderbyauthor => 1);
+if ( $order eq 'author' ) {
+    $template->param( orderbyauthor => 1 );
 }
 
-my $limit=$query->param('limit');
-if ($limit eq 'full'){
-  $limit=0;
-} else {
-  $limit=50;
+my $limit = $query->param('limit') || 50;
+if ( $limit eq 'full' ) {
+    $limit = 0;
+}
+else {
+    $limit = 50;
 }
-my ($count,$issues)=allissues($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 ( $issues ) = GetAllIssues( $borrowernumber, $order, $limit );
+
 
 my @loop_reading;
 
-for (my $i=0;$i<$count;$i++){
- 	my %line;
-	if($i%2){
-		$line{'toggle'} = 1;
+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'} );
+    }
+    push( @loop_reading, \%line );
+    $line{subtitle} = GetRecordValue('subtitle', $record, GetFrameworkCode($issue->{'biblionumber'}));
+}
+
+if (C4::Context->preference('BakerTaylorEnabled')) {
+	$template->param(
+		JacketImages=>1,
+		BakerTaylorEnabled  => 1,
+		BakerTaylorImageURL => &image_url(),
+		BakerTaylorLinkURL  => &link_url(),
+		BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'),
+	);
+}
+
+BEGIN {
+	if (C4::Context->preference('BakerTaylorEnabled')) {
+		require C4::External::BakerTaylor;
+		import C4::External::BakerTaylor qw(&image_url &link_url);
 	}
-	$line{biblionumber}=$issues->[$i]->{'biblionumber'};
-	$line{title}=$issues->[$i]->{'title'};
-	$line{author}=$issues->[$i]->{'author'};
-	$line{classification} = $issues->[$i]->{'classification'};
-	$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;
-	push(@loop_reading,\%line);
 }
 
-$template->param(count => $count);
-$template->param(READING_RECORD => \@loop_reading,
-				limit => $limit,
-				showfulllink => ($count > 50),		
-			     LibraryName => C4::Context->preference("LibraryName"),
-				suggestion => C4::Context->preference("suggestion"),
-				virtualshelves => C4::Context->preference("virtualshelves"),
-);
+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,
+    limit          => $limit,
+    showfulllink   => 1,
+	readingrecview => 1,
+	count          => scalar @loop_reading,
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;
-