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

diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 7a9abbea3d..3e78c9a29b 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -11,20 +11,22 @@
 # 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 C4::Output;
 
@@ -43,28 +45,26 @@ 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";
+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;
 }
@@ -72,52 +72,33 @@ else {
     $limit = 50;
 }
 
-my ( $count, $issues ) = GetAllIssues( $borrowernumber, $order2, $limit );
+my ( $issues ) = GetAllIssues( $borrowernumber, $order, $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++ ) {
+foreach my $issue (@{$issues} ) {
     my %line;
-    if ( $i % 2 ) {
-        $line{'toggle'} = 1;
-    }
 	
+    my $record = GetMarcBiblio($issue->{'biblionumber'});
+
 	# 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'}; 
+	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')) {
@@ -137,19 +118,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,
     limit          => $limit,
     showfulllink   => 1,
-	readingrecview => 1
+	readingrecview => 1,
+	count          => scalar @loop_reading,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
-