X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-readingrecord.pl;h=04c32930ee52c4c61aab29940ba68b7c2b7e5be2;hb=12cb095bac53f049d4148aec27a063a4dfa2c24e;hp=4c7cbda5ec944938cce83e2aee515c1ba33eca76;hpb=0b66bd800d9c5137240e48c2821a6871427d169d;p=koha.git

diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 4c7cbda5ec..04c32930ee 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -15,19 +15,20 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id$
 
 use strict;
-require Exporter;
+use warnings;
+
 use CGI;
 
 use C4::Auth;
 use C4::Koha;
+use C4::Biblio;
 use C4::Circulation;
-use C4::Date;
 use C4::Members;
+use Koha::DateUtils;
 
-use C4::Interface::CGI::Output;
+use C4::Output;
 
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
@@ -42,67 +43,93 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 );
 
 # get borrower information ....
-my ( $borr, $flags ) = GetMemberDetails( $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";
+my $order  = $query->param('order') || '';
+if ( $order eq '' ) {
+    $order = "date_due desc";
     $template->param( orderbydate => 1 );
 }
 
-if ( $order2 eq 'title' ) {
+if ( $order eq 'title' ) {
     $template->param( orderbytitle => 1 );
 }
 
-if ( $order2 eq 'author' ) {
+if ( $order eq 'author' ) {
     $template->param( orderbyauthor => 1 );
 }
 
-my $limit = $query->param('limit');
+my $limit = $query->param('limit') || 50;
 if ( $limit eq 'full' ) {
     $limit = 0;
 }
 else {
     $limit = 50;
 }
-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 ( $issues ) = GetAllIssues( $borrowernumber, $order, $limit );
+
 
 my @loop_reading;
 
-for ( my $i = 0 ; $i < $count ; $i++ ) {
+foreach my $issue (@{$issues} ) {
     my %line;
-    if ( $i % 2 ) {
-        $line{'toggle'} = 1;
+	
+    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'} );
     }
-    $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 );
+    $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);
+	}
+}
+
+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,
     limit          => $limit,
-    showfulllink   => ( $count > 50 ),
+    showfulllink   => 1,
+	readingrecview => 1,
+	count          => scalar @loop_reading,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
-