OPAC Advanced Search - have user's branch selected by default

[koha_fer] / opac / opac-readingrecord.pl

diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index e65351e..7377c76 100755 (executable)
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -17,7 +17,7 @@
 
 
 use strict;
-require Exporter;
+
 use CGI;
 
 use C4::Auth;
@@ -41,11 +41,10 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 );
 
 # get borrower information ....
-my ( $borr, $flags ) = GetMemberDetails( $borrowernumber );
+my ( $borr ) = GetMemberDetails( $borrowernumber );
 
 $template->param($borr);
 
-my $imgdir = getitemtypeimagesrc();
 my $itemtypes = GetItemTypes();
 
 # get the record
@@ -74,13 +73,10 @@ else {
 
 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 $borr = GetMemberDetails( $borrowernumber );
+my @bordat;
+$bordat[0] = $borr;
+$template->param( BORROWER_INFO => \@bordat );
 
 my @loop_reading;
 
@@ -91,37 +87,24 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
     }
        
        # 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;
-       }
-       
+       my $isbn = GetNormalizedISBN($issues->[$i]->{'isbn'});
+       $line{normalized_isbn} = $isbn;
     $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'}; 
+    $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(),
@@ -136,6 +119,12 @@ BEGIN {
        }
 }
 
+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,