X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-readingrecord.pl;h=4f16c66398d8924bc1a65f02d381ae7c7edcbbc7;hb=ef7ebc4ed4004dd3287e87500a6cce266c59cba6;hp=843384a6dc1e41c133868114e310708d272023da;hpb=71edba65d4c2b15e4873b9f1f0b122b09edd65c5;p=koha.git

diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 843384a6dc..4f16c66398 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -11,22 +11,26 @@
 # 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 MARC::Record;
 
 use C4::Output;
+use C4::Charset qw(StripNonXmlChars);
 
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
@@ -41,67 +45,103 @@ 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});
 
-# get the record
-my $order  = $query->param('order');
-my $order2 = $order;
-if ( $order2 eq '' ) {
-    $order2 = "date_due desc";
-    $template->param( orderbydate => 1 );
-}
+my $itemtypes = GetItemTypes();
 
-if ( $order2 eq 'title' ) {
+# get the record
+my $order = $query->param('order') || '';
+if ( $order eq 'title' ) {
     $template->param( orderbytitle => 1 );
 }
-
-if ( $order2 eq 'author' ) {
+elsif ( $order eq 'author' ) {
     $template->param( orderbyauthor => 1 );
 }
+else {
+    $order = "date_due desc";
+    $template->param( orderbydate => 1 );
+}
+
 
 my $limit = $query->param('limit');
-if ( $limit eq 'full' ) {
-    $limit = 0;
+$limit = ( $limit eq 'full' ) ? 0 : 50;
+
+my $issues = GetAllIssues( $borrowernumber, $order, $limit );
+
+my $itype_attribute =
+  ( C4::Context->preference('item-level_itypes') ) ? 'itype' : 'itemtype';
+
+my $opac_summary_html = C4::Context->preference('OPACMySummaryHTML');
+foreach my $issue ( @{$issues} ) {
+    $issue->{normalized_isbn} = GetNormalizedISBN( $issue->{isbn} );
+    if ( $issue->{$itype_attribute} ) {
+        $issue->{description} =
+          $itemtypes->{ $issue->{$itype_attribute} }->{description};
+        $issue->{imageurl} =
+          getitemtypeimagelocation( 'opac',
+            $itemtypes->{ $issue->{$itype_attribute} }->{imageurl} );
+    }
+    if ( $issue->{marcxml} ) {
+        my $marcxml = StripNonXmlChars( $issue->{marcxml} );
+        my $marc_rec =
+          MARC::Record::new_from_xml( $marcxml, 'utf8',
+            C4::Context->preference('marcflavour') );
+        $issue->{subtitle} =
+          GetRecordValue( 'subtitle', $marc_rec, $issue->{frameworkcode} );
+    }
+    # My Summary HTML
+    if ($opac_summary_html) {
+        my $my_summary_html = $opac_summary_html;
+        $issue->{author}
+          ? $my_summary_html =~ s/{AUTHOR}/$issue->{author}/g
+          : $my_summary_html =~ s/{AUTHOR}//g;
+        my $title = $issue->{title};
+        $title =~ s/\/+$//;    # remove trailing slash
+        $title =~ s/\s+$//;    # remove trailing space
+        $title
+          ? $my_summary_html =~ s/{TITLE}/$title/g
+          : $my_summary_html =~ s/{TITLE}//g;
+        $issue->{normalized_isbn}
+          ? $my_summary_html =~ s/{ISBN}/$issue->{normalized_isbn}/g
+          : $my_summary_html =~ s/{ISBN}//g;
+        $issue->{biblionumber}
+          ? $my_summary_html =~ s/{BIBLIONUMBER}/$issue->{biblionumber}/g
+          : $my_summary_html =~ s/{BIBLIONUMBER}//g;
+        $issue->{MySummaryHTML} = $my_summary_html;
+    }
 }
-else {
-    $limit = 50;
+
+if (C4::Context->preference('BakerTaylorEnabled')) {
+	$template->param(
+		JacketImages=>1,
+		BakerTaylorEnabled  => 1,
+		BakerTaylorImageURL => &image_url(),
+		BakerTaylorLinkURL  => &link_url(),
+		BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'),
+	);
 }
-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 @loop_reading;
-
-for ( my $i = 0 ; $i < $count ; $i++ ) {
-    my %line;
-    if ( $i % 2 ) {
-        $line{'toggle'} = 1;
-    }
-    $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 );
+
+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,
+    READING_RECORD => $issues,
     limit          => $limit,
-    showfulllink   => ( $count > 50 ),
+    showfulllink   => 1,
+    readingrecview => 1,
+    OPACMySummaryHTML => $opac_summary_html ? 1 : 0,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
-