From a2eb5852d3814bcc5bed05539ffb9b56e0c79dff Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Fri, 12 Mar 2010 17:09:06 +0100 Subject: [PATCH] Followup (MT #2920) fix reading record scripts:members/readingrec.pl Fixing Merge problem on opac/opac-readingrecord.pl Signed-off-by: Galen Charlton --- opac/opac-readingrecord.pl | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl index 21a90b61ef..e6550a50ca 100755 --- a/opac/opac-readingrecord.pl +++ b/opac/opac-readingrecord.pl @@ -88,20 +88,6 @@ foreach my $issue (@{$issues} ) { # XISBN Stuff my $isbn = GetNormalizedISBN($issue->{'isbn'}); $line{normalized_isbn} = $isbn; -<<<<<<< HEAD:opac/opac-readingrecord.pl - $line{biblionumber} = $issues->[$i]->{'biblionumber'}; - $line{title} = $issues->[$i]->{'title'}; - $line{author} = $issues->[$i]->{'author'}; - $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; - if($issues->[$i]->{'itemtype'}) { - $line{'itypedescription'} = $itemtypes->{ $issues->[$i]->{'itemtype'} }->{'description'}; - $line{imageurl} = getitemtypeimagelocation( 'opac', $itemtypes->{ $issues->[$i]->{'itemtype'} }->{'imageurl'} ); - } -======= $line{biblionumber} = $issue->{'biblionumber'}; $line{title} = $issue->{'title'}; $line{author} = $issue->{'author'}; @@ -109,9 +95,10 @@ foreach my $issue (@{$issues} ) { $line{date_due} = format_date( $issue->{'date_due'} ); $line{returndate} = format_date( $issue->{'returndate'} ); $line{volumeddesc} = $issue->{'volumeddesc'}; - $line{'description'} = $itemtypes->{ $issue->{'itemtype'} }->{'description'}; - $line{imageurl} = getitemtypeimagelocation( 'opac', $itemtypes->{ $issue->{'itemtype'} }->{'imageurl'} ); ->>>>>>> (MT #2920) fix reading record scripts:opac/opac-readingrecord.pl + 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($issues->[$i]->{'biblionumber'})); } -- 2.39.5