X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=reports%2Fissues_stats.pl;h=ddc3740c26e173650b2629d524f5de45f15e88ee;hb=9706908b269ebc068b19a0989ca8af6804b1a540;hp=dca3db46d843f60def656d19e8449db8f9308aad;hpb=c596d553740ebb6299b133fc6b71ca47ed0ff2e7;p=koha.git

diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl
index dca3db46d8..ddc3740c26 100755
--- a/reports/issues_stats.pl
+++ b/reports/issues_stats.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-# $Id$
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -15,61 +14,79 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
-use C4::Auth;
+#use warnings; FIXME - Bug 2505
+
 use CGI;
+use Date::Manip;
+
+use C4::Auth;
+use C4::Debug;
 use C4::Context;
 use C4::Branch; # GetBranches
-use C4::Output;
 use C4::Koha;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Circulation;
-use Date::Manip;
+use C4::Reports;
+use C4::Dates qw/format_date format_date_in_iso/;
+use C4::Members;
 
 =head1 NAME
 
-plugin that shows a stats on borrowers
+plugin that shows circulation stats
 
 =head1 DESCRIPTION
 
-
-=over2
+=over 2
 
 =cut
 
+# my $debug = 1;	# override for now.
 my $input = new CGI;
-my $do_it=$input->param('do_it');
 my $fullreportname = "reports/issues_stats.tmpl";
-my $line = $input->param("Line");
-my $column = $input->param("Column");
-my @filters = $input->param("Filter");
-my $podsp = $input->param("DisplayBy");
-my $type = $input->param("PeriodTypeSel");
-my $daysel = $input->param("PeriodDaySel");
+my $do_it    = $input->param('do_it');
+my $line     = $input->param("Line");
+my $column   = $input->param("Column");
+my @filters  = $input->param("Filter");
+$filters[0]=format_date_in_iso($filters[0]);
+$filters[1]=format_date_in_iso($filters[1]);
+my $podsp    = $input->param("DisplayBy");
+my $type     = $input->param("PeriodTypeSel");
+my $daysel   = $input->param("PeriodDaySel");
 my $monthsel = $input->param("PeriodMonthSel");
-my $calc = $input->param("Cellvalue");
-my $output = $input->param("output");
+my $calc     = $input->param("Cellvalue");
+my $output   = $input->param("output");
 my $basename = $input->param("basename");
-my $mime = $input->param("MIME");
-my $del = $input->param("sep");
-#warn "calcul : ".$calc;
-my ($template, $borrowernumber, $cookie)
-	= get_template_and_user({template_name => $fullreportname,
-				query => $input,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {reports => 1},
-				debug => 1,
-				});
+my ($template, $borrowernumber, $cookie) = get_template_and_user({
+	template_name => $fullreportname,
+	query => $input,
+	type => "intranet",
+	authnotrequired => 0,
+	flagsrequired => {reports => '*'},
+	debug => 0,
+});
+our $sep     = $input->param("sep");
+$sep = "\t" if ($sep eq 'tabulation');
 $template->param(do_it => $do_it,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
+);
+
+my $itemtypes = GetItemTypes();
+my $categoryloop = GetBorrowercategoryList;
+
+my $ccodes    = GetKohaAuthorisedValues("items.ccode");
+my $locations = GetKohaAuthorisedValues("items.location");
+
+my $Bsort1 = GetAuthorisedValues("Bsort1");
+my $Bsort2 = GetAuthorisedValues("Bsort2");
+my ($hassort1,$hassort2);
+$hassort1=1 if $Bsort1;
+$hassort2=1 if $Bsort2;
+
+
 if ($do_it) {
 # Displaying results
 	my $results = calculate($line, $column, $podsp, $type, $daysel, $monthsel, $calc, \@filters);
@@ -77,17 +94,14 @@ if ($do_it) {
 # Printing results to screen
 		$template->param(mainloop => $results);
 		output_html_with_http_headers $input, $cookie, $template->output;
-		exit(1);
 	} else {
 # Printing to a csv file
-		print $input->header(-type => 'application/vnd.sun.xml.calc',
-                                     -encoding    => 'utf-8',
-			-attachment=>"$basename.csv",
-			-filename=>"$basename.csv" );
-		my $cols = @$results[0]->{loopcol};
+        print $input->header(-type => 'application/vnd.sun.xml.calc',
+                            -encoding    => 'utf-8',
+                            -attachment=>"$basename.csv",
+                            -filename=>"$basename.csv" );
+		my $cols  = @$results[0]->{loopcol};
 		my $lines = @$results[0]->{looprow};
-		my $sep;
-		$sep =C4::Context->preference("delimiter");
 # header top-right
 		print @$results[0]->{line} ."/". @$results[0]->{column} .$sep;
 # Other header
@@ -99,150 +113,66 @@ if ($do_it) {
 		foreach my $line ( @$lines ) {
 			my $x = $line->{loopcell};
 			print $line->{rowtitle}.$sep;
-			foreach my $cell (@$x) {
-				print $cell->{value}.$sep;
-			}
-			print $line->{totalrow};
- 			print "\n";
-	 	}
-# footer
-		print "TOTAL";
-		$cols = @$results[0]->{loopfooter};
-		foreach my $col ( @$cols ) {
-			print $sep.$col->{totalcol};
+			print map {$_->{value}.$sep} @$x;
+			print $line->{totalrow}, "\n";
 		}
-		print $sep.@$results[0]->{total};
-		exit(1);
-	}
-# Displaying choices
-} else {
-	my $dbh = C4::Context->dbh;
-	my @values;
-	my %labels;
-	my %select;
-	my $req;
-	$req = $dbh->prepare("select distinctrow categorycode,description from categories order by description");
-	$req->execute;
-	my @select;
-	push @select,"";
-	$select{""}="";
-	while (my ($value, $desc) =$req->fetchrow) {
-		push @select, $value;
-		$select{$value}=$desc;
-	}
-	my $CGIBorCat=CGI::scrolling_list( -name     => 'Filter',
-				-id => 'Filter',
-				-values   => \@select,
-				-labels   => \%select,
-				-size     => 1,
-				-multiple => 0 );
-	
-	$req = $dbh->prepare( "select distinctrow itemtype,description from itemtypes order by description");
-	$req->execute;
-	undef @select;
-	undef %select;
-	push @select,"";
-	$select{""}="";
-	while (my ($value,$desc) =$req->fetchrow) {
-		push @select, $value;
-		$select{$value}=$desc;
-	}
-	my $CGIItemTypes=CGI::scrolling_list( -name     => 'Filter',
-				-id => 'Filter',
-				-values   => \@select,
-				-labels    => \%select,
-				-size     => 1,
-				-multiple => 0 );
-	
-	$req = $dbh->prepare("select distinctrow sort1 from borrowers where sort1 is not null order by sort1");
-	$req->execute;
-	undef @select;
-	push @select,"";
-	my $hassort1;
-	while (my ($value) =$req->fetchrow) {
-		$hassort1 =1 if ($value);
-		push @select, $value;
-	}
-	my $branches=GetBranches();
-	my @select_branch;
-	my %select_branches;
-	push @select_branch,"";
-	$select_branches{""} = "";
-	foreach my $branch (keys %$branches) {
-		push @select_branch, $branch;
-		$select_branches{$branch} = $branches->{$branch}->{'branchname'};
-	}
-	my $CGIBranch=CGI::scrolling_list( -name     => 'Filter',
-				-id => 'Filter',
-				-values   => \@select_branch,
-				-labels   => \%select_branches,
-				-size     => 1,
-				-multiple => 0 );
-	
-	my $CGISort1=CGI::scrolling_list( -name     => 'Filter',
-				-id => 'Filter',
-				-values   => \@select,
-				-size     => 1,
-				-multiple => 0 );
-	
-	$req = $dbh->prepare("select distinctrow sort2 from borrowers where sort2 is not null order by sort2");
-	$req->execute;
-	undef @select;
-	push @select,"";
-	my $hassort2;
-	my $hglghtsort2;
-	while (my ($value) =$req->fetchrow) {
-		$hassort2 =1 if ($value);
-		$hglghtsort2= !($hassort1);
-		push @select, $value;
+# footer
+        print "TOTAL";
+        $cols = @$results[0]->{loopfooter};
+		print map {$sep.$_->{totalcol}} @$cols;
+        print $sep.@$results[0]->{total};
 	}
-	my $CGISort2=CGI::scrolling_list( -name     => 'Filter',
-				-id => 'Filter',
-				-values   => \@select,
-				-size     => 1,
-				-multiple => 0 );
-	
-	my @mime = ( C4::Context->preference("MIME") );
-#	foreach my $mime (@mime){
-#		warn "".$mime;
-#	}
-	
-	my $CGIextChoice=CGI::scrolling_list(
-				-name     => 'MIME',
-				-id       => 'MIME',
-				-values   => \@mime,
-				-size     => 1,
-				-multiple => 0 );
-	
-	my @dels = ( C4::Context->preference("delimiter") );
-	my $CGIsepChoice=CGI::scrolling_list(
-				-name     => 'sep',
-				-id       => 'sep',
-				-values   => \@dels,
-				-size     => 1,
-				-multiple => 0 );
-	
-	$template->param(
-					CGIBorCat => $CGIBorCat,
-					CGIItemType => $CGIItemTypes,
-					CGIBranch => $CGIBranch,
-					hassort1=> $hassort1,
-					hassort2=> $hassort2,
-					HlghtSort2 => $hglghtsort2,
-					CGISort1 => $CGISort1,
-					CGISort2 => $CGISort2,
-					CGIextChoice => $CGIextChoice,
-					CGIsepChoice => $CGIsepChoice
-					);
-output_html_with_http_headers $input, $cookie, $template->output;
+	exit; # exit either way after $do_it
 }
 
+my $dbh = C4::Context->dbh;
+my @values;
+my %labels;
+my %select;
 
+# create itemtype arrayref for <select>.
+my @itemtypeloop;
+for my $itype ( sort {$itemtypes->{$a}->{description} cmp $itemtypes->{$b}->{description}} keys(%$itemtypes)) {
+	push @itemtypeloop, { code => $itype , description => $itemtypes->{$itype}->{description} } ;
+}
 
+    # location list
+my @locations;
+foreach (sort keys %$locations) {
+	push @locations, { code => $_, description => "$_ - " . $locations->{$_} };
+}
+    
+my @ccodes;
+foreach (sort {$ccodes->{$a} cmp $ccodes->{$b}} keys %$ccodes) {
+	push @ccodes, { code => $_, description => $ccodes->{$_} };
+}
+
+my $CGIextChoice=CGI::scrolling_list(
+	-name     => 'MIME',
+	-id       => 'MIME',
+	-values   => ['CSV'], # FIXME translation
+	-size     => 1,
+	-multiple => 0 );
+    
+my $CGIsepChoice=GetDelimiterChoices;
+ 
+$template->param(
+	categoryloop => $categoryloop,
+	itemtypeloop => \@itemtypeloop,
+	locationloop => \@locations,
+	   ccodeloop => \@ccodes,
+	  branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}),
+	hassort1=> $hassort1,
+	hassort2=> $hassort2,
+	Bsort1 => $Bsort1,
+	Bsort2 => $Bsort2,
+	CGIextChoice => $CGIextChoice,
+	CGIsepChoice => $CGIsepChoice,
+);
+output_html_with_http_headers $input, $cookie, $template->output;
 
 sub calculate {
 	my ($line, $column, $dsp, $type,$daysel,$monthsel ,$process, $filters) = @_;
-	my @mainloop;
 	my @loopfooter;
 	my @loopcol;
 	my @loopline;
@@ -256,291 +186,341 @@ sub calculate {
 # Checking filters
 #
 	my @loopfilter;
-	for (my $i=0;$i<=6;$i++) {
+	for (my $i=0;$i<=12;$i++) {
 		my %cell;
-		if ( @$filters[$i] ) {
-			if (($i==1) and (@$filters[$i-1])) {
-				$cell{err} = 1 if (@$filters[$i]<@$filters[$i-1]) ;
-			}
-			$cell{filter} .= @$filters[$i];
-			$cell{crit} .="Period From" if ($i==0);
-			$cell{crit} .="Period To" if ($i==1);
-			$cell{crit} .="Borrower Cat" if ($i==2);
-			$cell{crit} .="Doc Type" if ($i==3);
-			$cell{crit} .="Branch" if ($i==4);
-			$cell{crit} .="Sort1" if ($i==5);
-			$cell{crit} .="Sort2" if ($i==6);
-			push @loopfilter, \%cell;
+		(@$filters[$i]) or next;
+        if (($i==1) and (@$filters[$i-1])) {
+            $cell{err} = 1 if (@$filters[$i]<@$filters[$i-1]) ;
+        }
+            # format the dates filters, otherwise just fill as is
+        if ($i>=2) {
+          	$cell{filter} = @$filters[$i];
+        } else {
+          	$cell{filter} = format_date(@$filters[$i]);
 		}
-	}
-	push @loopfilter,{crit=>"Issue|Return ",filter=>$type};
-	push @loopfilter,{crit=>"Display by ",filter=>$dsp} if ($dsp);
-	push @loopfilter,{crit=>"Select Day ",filter=>$daysel} if ($daysel);
-	push @loopfilter,{crit=>"Select Month ",filter=>$monthsel} if ($monthsel);
-	
-	
+		$cell{crit} = 
+            ( $i == 0 )  ? "Period From"
+          : ( $i == 1 )  ? "Period To"
+          : ( $i == 2 )  ? "Patron Category ="
+          : ( $i == 3 )  ? "Item Type ="
+          : ( $i == 4 )  ? "Library ="
+          : ( $i == 5 )  ? "Collection ="
+          : ( $i == 6 )  ? "Location ="
+          : ( $i == 7 )  ? "Item callnumber >="
+          : ( $i == 8 )  ? "Item callnumber <"
+          : ( $i == 9 )  ? "sort1 ="
+          : ( $i == 10 ) ? "sort2 ="
+          : ( $i == 11 ) ? "Home library ="
+          : ( $i == 12 )? "Holding library ="
+          :                "UNKNOWN FILTER ($i)";
+
+		# FIXME - no translation mechanism !
+		push @loopfilter, \%cell;
+    }
+	push @loopfilter,{crit=>"Event",       filter=>$type    };
+	push @loopfilter,{crit=>"Display by",  filter=>$dsp     } if ($dsp);
+	push @loopfilter,{crit=>"Select Day",  filter=>$daysel  } if ($daysel);
+	push @loopfilter,{crit=>"Select Month",filter=>$monthsel} if ($monthsel);
+
 	my @linefilter;
-#	warn "filtres ".@filters[0];
-#	warn "filtres ".@filters[1];
-#	warn "filtres ".@filters[2];
-#	warn "filtres ".@filters[3];
-	
- 	$linefilter[0] = @$filters[0] if ($line =~ /datetime/ )  ;
- 	$linefilter[1] = @$filters[1] if ($line =~ /datetime/ )  ;
- 	$linefilter[0] = @$filters[2] if ($line =~ /category/ )  ;
- 	$linefilter[0] = @$filters[3] if ($line =~ /itemtype/ )  ;
- 	$linefilter[0] = @$filters[4] if ($line =~ /branch/ )  ;
-# 	$linefilter[0] = @$filters[11] if ($line =~ /sort2/ ) ;
- 	$linefilter[0] = @$filters[5] if ($line =~ /sort1/ ) ;
- 	$linefilter[0] = @$filters[6] if ($line =~ /sort2/ ) ;
-#warn "filtre lignes".$linefilter[0]." ".$linefilter[1];
-# 
- 	my @colfilter ;
- 	$colfilter[0] = @$filters[0] if ($column =~ /datetime/) ;
- 	$colfilter[1] = @$filters[1] if ($column =~ /datetime/) ;
- 	$colfilter[0] = @$filters[2] if ($column =~ /category/) ;
- 	$colfilter[0] = @$filters[3] if ($column =~ /itemtype/) ;
- 	$colfilter[0] = @$filters[4] if ($column =~ /branch/ )  ;
- 	$colfilter[0] = @$filters[5] if ($column =~ /sort1/  )  ;
- 	$colfilter[0] = @$filters[6] if ($column =~ /sort2/  )  ;
-#warn "filtre col ".$colfilter[0]." ".$colfilter[1];
-                                              
-# 1st, loop rows.                             
-	my $linefield;                               
-	if (($line =~/datetime/) and ($dsp == 1)) {
-		#Display by day
-		$linefield .="dayname($line)";  
-	} elsif (($line=~/datetime/) and ($dsp == 2)) {
-		#Display by Month
-		$linefield .="monthname($line)";  
-	} elsif (($line=~/datetime/) and ($dsp == 3)) {
-		#Display by Year
-		$linefield .="Year($line)";
-	} elsif ($line=~/datetime/) {
-		$linefield .= 'date_format(`datetime`,"%Y-%m-%d")';
+	$debug and warn "filtres ". join "|", @filters;
+	my ($colsource, $linesource);
+	$linefilter[1] = @$filters[1] if ($line =~ /datetime/);
+	$linefilter[0] = 
+	    ( $line =~ /datetime/ ) ? @$filters[0]
+      : ( $line =~ /category/ ) ? @$filters[2]
+      : ( $line =~ /itemtype/ ) ? @$filters[3]
+      : ( $line =~ /^branch/ )   ? @$filters[4]
+      : ( $line =~ /ccode/ )    ? @$filters[5]
+      : ( $line =~ /location/ ) ? @$filters[6]
+      : ( $line =~ /sort1/ )    ? @$filters[9]
+      : ( $line =~ /sort2/ )    ? @$filters[10]
+      : ( $line =~ /homebranch/)    ? @$filters[11]
+      : ( $line =~ /holdingbranch/) ? @$filters[12]
+      :                           undef;
+
+    if ( $line =~ /ccode/ or $line =~ /location/ or $line =~ /homebranch/ or $line =~ /holdingbranch/ ) {
+		$linesource = 'items';
+	}
+
+	my @colfilter;
+	$colfilter[1] = @$filters[1] if ($column =~ /datetime/);
+	$colfilter[0] = 
+        ( $column =~ /datetime/ ) ? @$filters[0]
+      : ( $column =~ /category/ ) ? @$filters[2]
+      : ( $column =~ /itemtype/ ) ? @$filters[3]
+      : ( $column =~ /^branch/ )   ? @$filters[4]
+      : ( $column =~ /ccode/ )    ? @$filters[5]
+      : ( $column =~ /location/ ) ? @$filters[6]
+      : ( $column =~ /sort1/ )    ? @$filters[9]
+      : ( $column =~ /sort1/ )    ? @$filters[10]
+      : ( $column =~ /homebranch/)    ? @$filters[11]
+      : ( $column =~ /holdingbranch/) ? @$filters[12]
+      :                             undef;
+
+    if ( $column =~ /ccode/ or $column =~ /location/ or $column =~ /homebranch/ or $column =~ /holdingbranch/ ) {
+		$colsource = 'items';
+	}
+# 1st, loop rows.
+	my $linefield;
+	if ($line =~ /datetime/) {
+		# by Day, Month or Year (1,2,3 respectively)
+		$linefield = ($dsp == 1) ? "  dayname($line)" :
+					 ($dsp == 2) ? "monthname($line)" :
+					 ($dsp == 3) ? "     Year($line)" :
+					'date_format(`datetime`,"%Y-%m-%d")'; # Probably should be left alone or passed through C4::Dates
 	} else {
-		$linefield .= $line;
-	}  
-	my $lineorder = $linefield;
-	$lineorder = "weekday($line)" if $linefield =~ /dayname/;
-	$lineorder = "month($line)" if $linefield =~ "^month";
-	$lineorder = $linefield if (not ($linefield =~ "^month") and not($linefield =~ /dayname/));
-
- 	my $strsth;
- 	$strsth .= "select distinctrow $linefield from statistics, borrowers where (statistics.borrowernumber=borrowers.borrowernumber) and $line is not null ";
-	
-	if ($line=~/datetime/) {
-		if ($linefilter[1] and ($linefilter[0])){
-			$strsth .= " and $line between ? and ? " ;
+		$linefield = $line;
+	}
+	my $lineorder = ($linefield =~ /dayname/) ? "weekday($line)" :
+					($linefield =~ /^month/ ) ? "  month($line)" : $linefield;
+
+	my $strsth = "SELECT distinctrow $linefield FROM statistics, ";
+		# get stats on items if ccode or location, otherwise borrowers.
+	$strsth .= ($linesource eq 'items' ) ?
+			" items     WHERE (statistics.itemnumber=items.itemnumber) " :
+			" borrowers WHERE (statistics.borrowernumber=borrowers.borrowernumber) ";
+	$strsth .= " AND $line is not null ";
+
+	if ($line =~ /datetime/) {
+		if ($linefilter[1] and ($linefilter[0])) {
+			$strsth .= " AND $line between ? AND ? ";
 		} elsif ($linefilter[1]) {
-				$strsth .= " and $line < ? " ;
+			$strsth .= " AND $line < ? ";
 		} elsif ($linefilter[0]) {
-			$strsth .= " and $line > ? " ;
+		$strsth .= " AND $line > ? ";
 		}
-		$strsth .= " and type ='".$type."' " if $type;
-		$strsth .= " and dayname(datetime) ='". $daysel ."' " if $daysel;
-		$strsth .= " and monthname(datetime) ='". $monthsel ."' " if $monthsel;
+		$strsth .= " AND type ='".$type."' " if $type;
+		$strsth .= " AND   dayname(datetime) ='".   $daysel ."' " if $daysel;
+		$strsth .= " AND monthname(datetime) ='". $monthsel ."' " if $monthsel;
 	} elsif ($linefilter[0]) {
 		$linefilter[0] =~ s/\*/%/g;
- 		$strsth .= " and $line LIKE ? " ;
- 	}
-	$strsth .=" group by $linefield";
-	$strsth .=" order by $lineorder";
-	warn "". $strsth;
-	
+		$strsth .= " AND $line LIKE ? ";
+	}
+	$strsth .=" group by $linefield order by $lineorder ";
+	$debug and warn $strsth;
+	push @loopfilter, {crit=>'SQL =', sql=>1, filter=>$strsth};
 	my $sth = $dbh->prepare( $strsth );
-	if (( @linefilter ) and ($linefilter[1])){
-		$sth->execute("'".$linefilter[0]."'","'".$linefilter[1]."'");
+	if ((@linefilter) and ($linefilter[1])){
+		$sth->execute($linefilter[0],$linefilter[1]);
 	} elsif ($linefilter[0]) {
 		$sth->execute($linefilter[0]);
 	} else {
 		$sth->execute;
 	}
-	
- 	while ( my ($celvalue) = $sth->fetchrow) {
- 		my %cell;
-		if ($celvalue) {
-			$cell{rowtitle} = $celvalue;
-		} else {
-			$cell{rowtitle} = "";
+
+	while (my ($celvalue) = $sth->fetchrow) {
+		my %cell = (rowtitle => $celvalue, totalrow => 0); # we leave 'rowtitle' as hash key (used when filling the table), and add coltitle_display
+		$cell{rowtitle_display} =
+			($line =~ /ccode/   ) ? $ccodes->{$celvalue}    :
+			($line =~ /location/) ? $locations->{$celvalue} :
+			($line =~ /itemtype/) ? $itemtypes->{$celvalue}->{description} :
+			$celvalue; # default fallback
+		if ($line =~ /sort1/) {
+			foreach (@$Bsort1) {
+				($celvalue eq $_->{authorised_value}) or next;
+				$cell{rowtitle_display} = $_->{lib} and last;
+			}
+		} elsif ($line =~ /sort2/) {
+			foreach (@$Bsort2) {
+				($celvalue eq $_->{authorised_value}) or next;
+				$cell{rowtitle_display} = $_->{lib} and last;
+			}
+		} elsif ($line =~ /category/) {
+			foreach (@$categoryloop) {
+				($celvalue eq $_->{categorycode}) or next;
+				$cell{rowtitle_display} = $_->{description} and last;
+			}
 		}
- 		$cell{totalrow} = 0;
 		push @loopline, \%cell;
- 	}
+	}
 
 # 2nd, loop cols.
 	my $colfield;
-	my $colorder;                               
-	if (($column =~/datetime/) and ($dsp == 1)) {
-		#Display by day
-		$colfield .="dayname($column)";  
-	} elsif (($column=~/datetime/) and ($dsp == 2)) {
-		#Display by Month
-		$colfield .="monthname($column)";  
-	} elsif (($column=~/datetime/) and ($dsp == 3)) {
-		#Display by Year
-		$colfield .="Year($column)";
-	} elsif ($column=~/datetime/) {
-		$colfield .='date_format(`datetime`,"%Y-%m-%d")';	
+	my $colorder;
+	if ($column =~ /datetime/) {
+		#Display by Day, Month or Year (1,2,3 respectively)
+		$colfield = ($dsp == 1) ? "  dayname($column)" :
+					($dsp == 2) ? "monthname($column)" :
+					($dsp == 3) ? "     Year($column)" :
+					'date_format(`datetime`,"%Y-%m-%d")'; # Probably should be left alone or passed through C4::Dates
 	} else {
-		$colfield .= $column;
-	}  
-	$colorder = "weekday($line)" if $colfield =~ "^dayname";
-	$colorder = "month($line)" if $colfield =~ "^month";
-	$colorder = $colfield if (not ($colfield =~ "^month") and not($colfield =~ "^dayname"));
-	
- 	my $strsth2;
- 	$strsth2 .= "select distinctrow $colfield from statistics, borrowers where (statistics.borrowernumber=borrowers.borrowernumber) and $column is not null ";
-	
-	if ($column=~/datetime/){
-		if (($colfilter[1]) and ($colfilter[0])){
-			$strsth2 .= " and $column between ? and ? " ;
-		} elsif ($colfilter[1]) {
-			$strsth2 .= " and $column < ? " ;
-		} elsif ($colfilter[0]) {
-			$strsth2 .= " and $column > ? " ;
-		}
-		$strsth2 .= " and type ='".$type."' " if $type;
-		$strsth2 .= " and dayname(datetime) ='". $daysel ."' " if $daysel;
-		$strsth2 .= " and monthname(datetime) ='". $monthsel ."' " if $monthsel;
-	} elsif ($colfilter[0]) {
-		$colfilter[0] =~ s/\*/%/g;
- 		$strsth2 .= " and $column LIKE ? " ;
- 	}
-	$strsth2 .=" group by $colfield";
-	$strsth2 .=" order by $colorder";
-#	warn "". $strsth2;
-	
-	my $sth2 = $dbh->prepare( $strsth2 );
-	if (( @colfilter ) and ($colfilter[1])){
-		$sth2->execute("'".$colfilter[0]."'","'".$colfilter[1]."'");
+		$colfield = $column;
+	}
+	$colorder = ($colfield =~ /dayname/) ? "weekday($column)" :
+				($colfield =~ /^month/ ) ? "  month($column)" : $colfield;
+	my $strsth2 = "SELECT distinctrow $colfield FROM statistics, ";
+	# get stats on items if ccode or location, otherwise borrowers.
+	$strsth2 .= ($colsource eq 'items' ) ?
+				"items     WHERE (statistics.itemnumber=items.itemnumber) " :
+				"borrowers WHERE (statistics.borrowernumber=borrowers.borrowernumber) ";
+	$strsth2 .= " AND $column IS NOT NULL ";
+
+	if ($column =~ /datetime/){
+        if (($colfilter[1]) and ($colfilter[0])){
+			$strsth2 .= " AND $column BETWEEN ? AND ? " ;
+        } elsif ($colfilter[1]) {
+			$strsth2 .= " AND $column < ? " ;
+        } elsif ($colfilter[0]) {
+			$strsth2 .= " AND $column > ? " ;
+        }
+        $strsth2 .= " AND                type ='". $type     ."' " if $type;
+        $strsth2 .= " AND   dayname(datetime) ='". $daysel   ."' " if $daysel;
+        $strsth2 .= " AND monthname(datetime) ='". $monthsel ."' " if $monthsel;
+    } elsif ($colfilter[0]) {
+        $colfilter[0] =~ s/\*/%/g;
+        $strsth2 .= " AND $column LIKE ? " ;
+    }
+	$strsth2 .=" GROUP BY $colfield ORDER BY $colorder ";
+
+	my $sth2 = $dbh->prepare($strsth2);
+	push @loopfilter, {crit=>'SQL =', sql=>1, filter=>$strsth2};
+	if ((@colfilter) and ($colfilter[1])){
+		$sth2->execute($colfilter[0], $colfilter[1]);
 	} elsif ($colfilter[0]) {
 		$sth2->execute($colfilter[0]);
 	} else {
 		$sth2->execute;
 	}
-	
-
- 	while (my ($celvalue) = $sth2->fetchrow) {
- 		my %cell;
-		my %ft;
-#		warn "coltitle :".$celvalue;
-		$cell{coltitle} = $celvalue;
-		$ft{totalcol} = 0;
+
+	while (my ($celvalue) = $sth2->fetchrow) {
+		my %cell = (coltitle => $celvalue); # we leave 'coltitle' as hash key (used when filling the table), and add coltitle_display
+		$cell{coltitle_display} =
+			($column =~ /ccode/   ) ?    $ccodes->{$celvalue} :
+			($column =~ /location/) ? $locations->{$celvalue} :
+			($column =~ /itemtype/) ? $itemtypes->{$celvalue}->{description} :
+			$celvalue; # default fallback
+		if ($column =~ /sort1/) {
+			foreach (@$Bsort1) {
+				($celvalue eq $_->{authorised_value}) or next;
+				$cell{coltitle_display} = $_->{lib} and last;
+			}
+		} elsif ($column =~ /sort2/) {
+			foreach (@$Bsort2) {
+				($celvalue eq $_->{authorised_value}) or next;
+				$cell{coltitle_display} = $_->{lib} and last;
+			}
+		} elsif ($column =~ /category/) {
+			foreach (@$categoryloop) {
+				($celvalue eq $_->{categorycode}) or next;
+				$cell{coltitle_display} = $_->{description} and last;
+			}
+		}
 		push @loopcol, \%cell;
- 	}
-#	warn "fin des titres colonnes";
+	}
 
-	my $i=0;
-	my @totalcol;
-	my $hilighted=-1;
-	
 	#Initialization of cell values.....
 	my %table;
-#	warn "init table";
-	foreach my $row ( @loopline ) {
-		foreach my $col ( @loopcol ) {
-#			warn " init table : $row->{rowtitle} / $col->{coltitle} ";
-			$table{$row->{rowtitle}}->{$col->{coltitle}}=0;
+	foreach my $row (@loopline) {
+		foreach my $col (@loopcol) {
+			$debug and warn " init table : $row->{rowtitle} ( $row->{rowtitle_display} ) / $col->{coltitle} ( $col->{coltitle_display} )  ";
+			$table{$row->{rowtitle}}->{$col->{coltitle}} = 0;
 		}
-		$table{$row->{rowtitle}}->{totalrow}=0;
+		$table{$row->{rowtitle}}->{totalrow} = 0;
 	}
 
 # preparing calculation
-	my $strcalc ;
-
-	$strcalc .= "SELECT $linefield, $colfield, ";
-	$strcalc .= "COUNT( * ) " if ($process ==1);
-	if ($process ==2){
-		$strcalc .= "(COUNT(DISTINCT borrowers.borrowernumber))" ;
-	}
-	if ($process ==3){
-		$strcalc .= "(COUNT(DISTINCT issues.itemnumber))" ;
-	}
-	if ($process ==4){
+    my $strcalc = "SELECT $linefield, $colfield, ";
+        $strcalc .= ($process == 1) ? " COUNT(*) "                                 :
+					($process == 2) ? "(COUNT(DISTINCT borrowers.borrowernumber))" :
+        			($process == 3) ? "(COUNT(DISTINCT statistics.itemnumber))"        : '';
+	if ($process == 4) {
 		my $rqbookcount = $dbh->prepare("SELECT count(*) FROM items");
 		$rqbookcount->execute;
 		my ($bookcount) = $rqbookcount->fetchrow;
-		$strcalc .= "100*(COUNT(DISTINCT issues.itemnumber))/ $bookcount " ;
+		$strcalc .= "100*(COUNT(DISTINCT statistics.itemnumber))/ $bookcount " ;
 	}
-	$strcalc .= "FROM statistics,borrowers where (statistics.borrowernumber=borrowers.borrowernumber) ";
-
-	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
-	$strcalc .= " AND statistics.datetime > '" . @$filters[0] ."'" if ( @$filters[0] );
-	@$filters[1]=~ s/\*/%/g if (@$filters[1]);
-	$strcalc .= " AND statistics.datetime < '" . @$filters[1] ."'" if ( @$filters[1] );
-	@$filters[2]=~ s/\*/%/g if (@$filters[2]);
-	$strcalc .= " AND borrowers.categorycode like '" . @$filters[2] ."'" if ( @$filters[2] );
-	@$filters[3]=~ s/\*/%/g if (@$filters[3]);
-	$strcalc .= " AND statistics.itemtype like '" . @$filters[3] ."'" if ( @$filters[3] );
-	@$filters[4]=~ s/\*/%/g if (@$filters[4]);
-	$strcalc .= " AND statistics.branch like '" . @$filters[4] ."'" if ( @$filters[4] );
-	@$filters[5]=~ s/\*/%/g if (@$filters[5]);
-	$strcalc .= " AND borrowers.sort1 like '" . @$filters[5] ."'" if ( @$filters[5] );
-	@$filters[6]=~ s/\*/%/g if (@$filters[6]);
-	$strcalc .= " AND borrowers.sort2 like '" . @$filters[6] ."'" if ( @$filters[6] );
-	$strcalc .= " AND dayname(datetime) like '" . $daysel ."'" if ( $daysel );
-	$strcalc .= " AND monthname(datetime) like '" . $monthsel ."'" if ( $monthsel );
-	$strcalc .= " AND statistics.type like '" . $type ."'" if ( $type );
-	
-	$strcalc .= " group by $linefield, $colfield order by $lineorder,$colorder";
-	warn "". $strcalc;
+	$strcalc .= "
+        FROM statistics
+        LEFT JOIN borrowers ON statistics.borrowernumber=borrowers.borrowernumber
+	";
+	$strcalc .= "LEFT JOIN items ON statistics.itemnumber=items.itemnumber "
+        if ($linefield =~ /^items\./ or $colfield =~ /^items\./ or ($colsource eq 'items')
+            ||@$filters[5]||@$filters[6]||@$filters[7]||@$filters[8]);
+        
+	$strcalc .= "WHERE 1=1 ";
+	@$filters = map {defined($_) and s/\*/%/g; $_} @$filters;
+	$strcalc .= " AND statistics.datetime > '"       . @$filters[0] ."'" if (@$filters[0] );
+	$strcalc .= " AND statistics.datetime < '"       . @$filters[1] ."'" if (@$filters[1] );
+	$strcalc .= " AND borrowers.categorycode LIKE '" . @$filters[2] ."'" if (@$filters[2] );
+	$strcalc .= " AND statistics.itemtype LIKE '"    . @$filters[3] ."'" if (@$filters[3] );
+	$strcalc .= " AND statistics.branch LIKE '"      . @$filters[4] ."'" if (@$filters[4] );
+	$strcalc .= " AND items.ccode LIKE '"            . @$filters[5] ."'" if (@$filters[5] );
+	$strcalc .= " AND items.location LIKE '"         . @$filters[6] ."'" if (@$filters[6] );
+	$strcalc .= " AND items.itemcallnumber >='"      . @$filters[7] ."'" if (@$filters[7] );
+	$strcalc .= " AND items.itemcallnumber <'"       . @$filters[8] ."'" if (@$filters[8] );
+	$strcalc .= " AND borrowers.sort1 LIKE '"        . @$filters[9] ."'" if (@$filters[9] );
+	$strcalc .= " AND borrowers.sort2 LIKE '"        . @$filters[10]."'" if (@$filters[10]);
+	$strcalc .= " AND dayname(datetime) LIKE '"      . $daysel      ."'" if ($daysel  );
+	$strcalc .= " AND monthname(datetime) LIKE '"    . $monthsel    ."'" if ($monthsel);
+	$strcalc .= " AND statistics.type LIKE '"        . $type        ."'" if ($type    );
+
+	$strcalc .= " GROUP BY $linefield, $colfield order by $lineorder,$colorder";
+	($debug) and warn $strcalc;
 	my $dbcalc = $dbh->prepare($strcalc);
+	push @loopfilter, {crit=>'SQL =', sql=>1, filter=>$strcalc};
 	$dbcalc->execute;
-# 	warn "filling table";
-	my $emptycol; 
+	my ($emptycol,$emptyrow); 
 	while (my ($row, $col, $value) = $dbcalc->fetchrow) {
-		warn "filling table $row / $col / $value ";
-		$emptycol = 1 if ($col eq undef);
-		$col = "zzEMPTY" if ($col eq undef);
-		$row = "zzEMPTY" if ($row eq undef);
-		
-		$table{$row}->{$col}+=$value;
-		$table{$row}->{totalrow}+=$value;
+		($debug) and warn "filling table $row / $col / $value ";
+		unless (defined $col) {
+			$emptycol = 1; 
+			$col = "zzEMPTY" ;
+		}
+		unless (defined $row) {
+			$emptyrow = 1;
+			$row = "zzEMPTY"; 
+		}
+		$table{$row}->{$col}     += $value;
+		$table{$row}->{totalrow} += $value;
 		$grantotal += $value;
 	}
-	push @loopcol,{coltitle => "NULL"} if ($emptycol);
+	push @loopcol, {coltitle => "NULL", coltitle_display => 'NULL'} if ($emptycol);
+	push @loopline,{rowtitle => "NULL", rowtitle_display => 'NULL'} if ($emptyrow);
 
 	foreach my $row (@loopline) {
 		my @loopcell;
 		#@loopcol ensures the order for columns is common with column titles
 		# and the number matches the number of columns
-		foreach my $col ( @loopcol ) {
-			my $value =$table{($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}};
-			push @loopcell, {value => $value  } ;
+		foreach my $col (@loopcol) {
+			my $value = $table{null_to_zzempty($row->{rowtitle})}->{null_to_zzempty($col->{coltitle})};
+			push @loopcell, {value => $value};
 		}
-		push @looprow,{ 'rowtitle' => ($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle},
-							'loopcell' => \@loopcell,
-							'hilighted' => ($hilighted >0),
-							'totalrow' => $table{($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}}->{totalrow}
-						};
-		$hilighted = -$hilighted;
+		my $rowtitle = ($row->{rowtitle} eq "NULL") ? "zzEMPTY" : $row->{rowtitle};
+		push @looprow, {
+			'rowtitle_display' => $row->{rowtitle_display},
+			'rowtitle' => $rowtitle,
+			'loopcell' => \@loopcell,
+			'totalrow' => $table{$rowtitle}->{totalrow}
+		};
 	}
-	
-#	warn "footer processing";
-	foreach my $col ( @loopcol ) {
-		my $total=0;
-		foreach my $row ( @looprow ) {
-			$total += $table{($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}};
-#			warn "value added ".$table{$row->{rowtitle}}->{$col->{coltitle}}. "for line ".$row->{rowtitle};
+	for my $col ( @loopcol ) {
+		my $total = 0;
+		foreach my $row (@looprow) {
+			$total += $table{null_to_zzempty($row->{rowtitle})}->{null_to_zzempty($col->{coltitle})};
+			$debug and warn "value added ".$table{$row->{rowtitle}}->{$col->{coltitle}}. "for line ".$row->{rowtitle};
 		}
-#		warn "summ for column ".$col->{coltitle}."  = ".$total;
 		push @loopfooter, {'totalcol' => $total};
 	}
-			
 
 	# the header of the table
 	$globalline{loopfilter}=\@loopfilter;
 	# the core of the table
 	$globalline{looprow} = \@looprow;
 	$globalline{loopcol} = \@loopcol;
-# 	# the foot (totals by borrower type)
+	# 	# the foot (totals by borrower type)
 	$globalline{loopfooter} = \@loopfooter;
-	$globalline{total}= $grantotal;
-	$globalline{line} = $line;
+	$globalline{total}  = $grantotal;
+	$globalline{line}   = $line;
 	$globalline{column} = $column;
-	push @mainloop,\%globalline;
-	return \@mainloop;
+	return [(\%globalline)];
+}
+
+sub null_to_zzempty ($) {
+	my $string = shift;
+	defined($string)    or  return 'zzEMPTY';
+	($string eq "NULL") and return 'zzEMPTY';
+	return $string;		# else return the valid value
 }
 
 1;