Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 7679: Various fixes for circulation statistics wizard

Browse source 
- use SQL TRIM functions to avoid having '' and ' ' considered as
  different values
- use Text::Unaccent to remove accents from columns or rows values when
  accessing %table. This is required as MySQL consider as equals two
  strings that differ only by their accents when using GROUP BY clause.
- Exclude '' values from the list of columns or rows. Otherwise we could
  have a row 'UNKNOWN VALUE' and a row 'NULL' which both have the same
  values in their cells.

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Julian Maurice 2014-03-24 11:56:58 +01:00 committed by Kyle M Hall
parent 916e9f4619
commit 13a528f2f3
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reports/issues_stats.pl
View file

@ -22,6 +22,7 @@ use warnings;
use CGI qw ( -utf8 );
use Date::Manip;
use Text::Unaccent;
use C4::Auth;
use C4::Debug;
@ -320,7 +321,7 @@ sub calculate {
( $linesource eq 'items' )
? " LEFT JOIN items ON (statistics.itemnumber = items.itemnumber) "
: " LEFT JOIN borrowers ON (statistics.borrowernumber = borrowers.borrowernumber) ";
$strsth .= " WHERE $line is not null ";
$strsth .= " WHERE $line is not null AND $line != '' ";
}
if ( $line =~ /datetime/ ) {
@ -408,7 +409,7 @@ sub calculate {
( $colsource eq 'items' )
? "LEFT JOIN items ON (statistics.itemnumber = items.itemnumber) "
: "LEFT JOIN borrowers ON (statistics.borrowernumber = borrowers.borrowernumber) ";
$strsth2 .= " WHERE $column IS NOT NULL ";
$strsth2 .= " WHERE $column IS NOT NULL AND $column != '' ";
}
if ( $column =~ /datetime/ ) {
@ -480,14 +481,14 @@ sub calculate {
# preparing calculation
my $strcalc = "SELECT ";
if($line_attribute_type) {
$strcalc .= "attribute_$line_attribute_type.attribute AS line_attribute, ";
$strcalc .= "TRIM(attribute_$line_attribute_type.attribute) AS line_attribute, ";
} else {
$strcalc .= "$linefield, ";
$strcalc .= "TRIM($linefield), ";
}
if($column_attribute_type) {
$strcalc .= "attribute_$column_attribute_type.attribute AS column_attribute, ";
$strcalc .= "TRIM(attribute_$column_attribute_type.attribute) AS column_attribute, ";
} else {
$strcalc .= "$colfield, ";
$strcalc .= "TRIM($colfield), ";
}
$strcalc .=
( $process == 1 ) ? " COUNT(*) "
@ -642,19 +643,25 @@ sub null_to_zzempty {
sub table_set {
my ($table, $row, $col, $val) = @_;
$table->{ null_to_zzempty(lc($row)) }->{ null_to_zzempty(lc($col)) } = $val;
$row = lc(unac_string('utf-8', $row // ''));
$col = lc(unac_string('utf-8', $col // ''));
$table->{ null_to_zzempty($row) }->{ null_to_zzempty($col) } = $val;
}
sub table_get {
my ($table, $row, $col) = @_;
return $table->{ null_to_zzempty(lc($row)) }->{ null_to_zzempty(lc($col)) };
$row = lc(unac_string('utf-8', $row // ''));
$col = lc(unac_string('utf-8', $col // ''));
return $table->{ null_to_zzempty($row) }->{ null_to_zzempty($col) };
}
sub table_inc {
my ($table, $row, $col, $inc) = @_;
$table->{ null_to_zzempty(lc($row // '')) }->{ null_to_zzempty(lc($col // '')) } += $inc;
$row = lc(unac_string('utf-8', $row // ''));
$col = lc(unac_string('utf-8', $col // ''));
$table->{ null_to_zzempty($row) }->{ null_to_zzempty($col) } += $inc;
}
1;