From 311d958bbb97f6b5934aabb984e58d68c4d363ab Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Tue, 9 Nov 2010 22:40:21 -0500 Subject: [PATCH] follow-up: improve use of home and holding library in circ stats report [1] Actually make use of home/holding library if set [2] Use current terminology - "library", not "branch" Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack --- reports/issues_stats.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl index ea87aa2fc8..2f8a7e359f 100755 --- a/reports/issues_stats.pl +++ b/reports/issues_stats.pl @@ -187,7 +187,7 @@ sub calculate { # Checking filters # my @loopfilter; - for (my $i=0;$i<=10;$i++) { + for (my $i=0;$i<=12;$i++) { my %cell; (@$filters[$i]) or next; if (($i==1) and (@$filters[$i-1])) { @@ -211,8 +211,8 @@ sub calculate { : ( $i == 8 ) ? "Item callnumber <" : ( $i == 9 ) ? "sort1 =" : ( $i == 10 ) ? "sort2 =" - : ( $i == 11 ) ? "Home branch =" - : ( $i == 12 )? "Holding branch =" + : ( $i == 11 ) ? "Home library =" + : ( $i == 12 )? "Holding library =" : "UNKNOWN FILTER ($i)"; # FIXME - no translation mechanism ! @@ -231,7 +231,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] @@ -250,7 +250,7 @@ sub calculate { ( $column =~ /datetime/ ) ? @$filters[0] : ( $column =~ /category/ ) ? @$filters[2] : ( $column =~ /itemtype/ ) ? @$filters[3] - : ( $column =~ /branch/ ) ? @$filters[4] + : ( $column =~ /^branch/ ) ? @$filters[4] : ( $column =~ /ccode/ ) ? @$filters[5] : ( $column =~ /location/ ) ? @$filters[6] : ( $column =~ /sort1/ ) ? @$filters[9] -- 2.39.5