[Koha-patches] [3.2 12/13] [MT3191] various perl errors in script (merge conflict)
Henri-Damien LAURENT
henridamien.laurent at biblibre.com
Wed Mar 24 09:24:29 CET 2010
From: Paul Poulain <paul.poulain at biblibre.com>
and SQL error solved
---
members/readingrec.pl | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/members/readingrec.pl b/members/readingrec.pl
index 6488be2..24fc15b 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -50,23 +50,8 @@ if ($input->param('borrowernumber')) {
$data = GetMember(borrowernumber => $borrowernumber);
}
-my $order=$input->param('order') || '';
-my $order2=$order;
-if ($order2 eq ''){
- $order2="date_due desc";
-}
+my $order=$input->param('order') || 'date_due desc';
my $limit=$input->param('limit');
-=======
-my $borrowernumber = $input->param('borrowernumber');
-my $limit = $input->param('limit');
-my $order = $input->param('order') || '';
-
-$order = "issuestimestamp desc" if not any { $order =~ $_ } ('issuestimestamp', 'title', 'author', 'returndate');
-
-#get borrower details
-my $data=GetMember('borrowernumber'=>$borrowernumber);
-
->>>>>>> (MT #2920) fix reading record scripts:members/readingrec.pl
if ($limit){
if ($limit eq 'full'){
@@ -77,6 +62,7 @@ else {
$limit=50;
}
my ( $issues ) = GetAllIssues($borrowernumber,$order,$limit);
+warn "BORR : $borrowernumber = ".Data::Dumper::Dumper($issues);
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "members/readingrec.tmpl",
@@ -99,7 +85,7 @@ foreach my $issue (@{$issues}){
$line{date_due} = format_date($issue->{'date_due'});
$line{returndate} = format_date($issue->{'returndate'});
$line{issuedate} = format_date($issue->{'issuedate'});
- $line{issuingbranch} = GetBranchName($issues->[$i]->{'issuingbranch'});
+ $line{issuingbranch} = GetBranchName($issue->{'issuingbranch'});
$line{renewals} = $issue->{'renewals'};
$line{barcode} = $issue->{'barcode'};
$line{volumeddesc} = $issue->{'volumeddesc'};
--
1.6.3.3
More information about the Koha-patches
mailing list