X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-readingrecord.pl;h=c850cfead71eadd5822f33f1ed5b2a9c7615cc91;hb=970b41ed2ef6b17c9361da6d3387f0424b04343e;hp=b202ee522860d6cab31500dd09b455a5a5d82c16;hpb=606ecb532aa42562687bf0d05b4d6df6697300d7;p=koha.git

diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index b202ee5228..c850cfead7 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -17,13 +17,13 @@
 
 
 use strict;
-require Exporter;
+
 use CGI;
 
 use C4::Auth;
 use C4::Koha;
 use C4::Circulation;
-use C4::Date;
+use C4::Dates qw/format_date/;
 use C4::Members;
 
 use C4::Output;
@@ -41,10 +41,12 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 );
 
 # get borrower information ....
-my ( $borr, $flags ) = GetMemberDetails( $borrowernumber );
+my ( $borr ) = GetMemberDetails( $borrowernumber );
 
 $template->param($borr);
 
+my $itemtypes = GetItemTypes();
+
 # get the record
 my $order  = $query->param('order');
 my $order2 = $order;
@@ -68,6 +70,7 @@ if ( $limit eq 'full' ) {
 else {
     $limit = 50;
 }
+
 my ( $count, $issues ) = GetAllIssues( $borrowernumber, $order2, $limit );
 
 # add the row parity
@@ -82,25 +85,66 @@ my @loop_reading;
 
 for ( my $i = 0 ; $i < $count ; $i++ ) {
     my %line;
-    if ( $i % 2 ) {
-        $line{'toggle'} = 1;
-    }
+	
+	# 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{classification} = $issues->[$i]->{'classification'};
+    $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}       = getitemtypeimagelocation( 'opac', $itemtypes->{ $issues->[$i]->{'itemtype'}  }->{'imageurl'} );
     push( @loop_reading, \%line );
 }
 
+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(AmazonContent 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
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;