From 9789ce72a7bb1763a5e18ace9477595868a484c9 Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Fri, 8 Jul 2011 11:36:17 +0200 Subject: [PATCH] bug 6568 problem in SQL generated Problem on GetPendingIssues When no @borrowernumber sent in GetPendingIssues SQL generated is wrong. This patch is fixing that and adds some testing on relissues lists --- C4/Members.pm | 1 + circ/circulation.pl | 20 +++++++++++--------- members/moremember.pl | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/C4/Members.pm b/C4/Members.pm index 4eb9979..0c536d9 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -1032,6 +1032,7 @@ The keys include C fields except marc and marcxml. #' sub GetPendingIssues { my (@borrowernumbers) = @_; + return unless scalar(@borrowernumbers); # Borrowers part of the query my $bquery = ''; diff --git a/circ/circulation.pl b/circ/circulation.pl index c34db54..a9ac69e 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -458,18 +458,20 @@ sub build_issue_data { if ($borrower) { - # Getting borrower relatives - my @relborrowernumbers = GetMemberRelatives($borrower->{'borrowernumber'}); - #push @borrowernumbers, $borrower->{'borrowernumber'}; - # get each issue of the borrower & separate them in todayissues & previous issues my ($issueslist) = GetPendingIssues($borrower->{'borrowernumber'}); - my ($relissueslist) = GetPendingIssues(@relborrowernumbers); - build_issue_data($issueslist, 0); - build_issue_data($relissueslist, 1); - - $displayrelissues = scalar($relissueslist); + + # Getting borrower relatives + my @relborrowernumbers = GetMemberRelatives($borrower->{'borrowernumber'}); + if (scalar(@relborrowernumbers)>0){ + my $relissueslist = GetPendingIssues(@relborrowernumbers); + if ($relissueslist){ + build_issue_data($relissueslist, 1); + $displayrelissues = scalar($relissueslist); + } + } + if ( C4::Context->preference( "todaysIssuesDefaultSortOrder" ) eq 'asc' ) { @todaysissues = sort { $a->{'timestamp'} cmp $b->{'timestamp'} } @todaysissues; diff --git a/members/moremember.pl b/members/moremember.pl index b766f2f..3601669 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -244,7 +244,7 @@ my @borrowernumbers = GetMemberRelatives($borrowernumber); my $issue = GetPendingIssues($borrowernumber); my $relissue = GetPendingIssues(@borrowernumbers); my $issuecount = scalar(@$issue); -my $relissuecount = scalar(@$relissue); +my $relissuecount = ($relissue?scalar(@$relissue):0); my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} ); my $today = POSIX::strftime("%Y-%m-%d", localtime); # iso format my @issuedata; -- 1.7.1