From b9f8bdfe4a8f1981ca50a7d28c0b4f6330651aef Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 29 Oct 2012 16:20:36 +0100 Subject: [PATCH] Bug 7679: Followup: circulation statistics wizard improvements --- reports/issues_stats.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl index 43f1543..84ecb0c 100755 --- a/reports/issues_stats.pl +++ b/reports/issues_stats.pl @@ -259,7 +259,7 @@ sub calculate { ( $line =~ /datetime/ ) ? @$filters[0] : ( $line =~ /category/ ) ? @$filters[2] : ( $line =~ /itemtype/ ) ? @$filters[3] - : ( $line =~ /branch/ ) ? @$filters[4] + : ( $line =~ /^branch/ ) ? @$filters[4] : ( $line =~ /ccode/ ) ? @$filters[5] : ( $line =~ /location/ ) ? @$filters[6] : ( $line =~ /sort1/ ) ? @$filters[9] @@ -519,7 +519,7 @@ sub calculate { if ( $linefield =~ /^items\./ or $colfield =~ /^items\./ or $process == 5 - or ( $colsource eq 'items' ) || @$filters[5] || @$filters[6] || @$filters[7] || @$filters[8] ); + or ( $colsource eq 'items' ) || @$filters[5] || @$filters[6] || @$filters[7] || @$filters[8] || @$filters[9] || @$filters[10] || @$filters[11] || @$filters[12] || @$filters[13] ); $strcalc .= "WHERE 1=1 "; @$filters = map { defined($_) and s/\*/%/g; $_ } @$filters; -- 1.7.10.4