From d63d9086e9359dfc421129713467b7d35f9df293 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Mon, 1 Sep 2014 17:22:00 +0200 Subject: [PATCH] Bug 7679: Display all table headers (case and accent sensitive) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It appears that we can't assume that a lowercase word is equivalent to the same word in uppercase (or a mix of lowercase and uppercase letters). And this is also true about accented words. So display all values even if they differ only by case or by their accents. This means that: - "foobar" and "Foobar" will be in two separate rows/columns - "Etudiant" and "Étudiant" (french) will be in two separate rows/columns too --- reports/issues_stats.pl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl index b7c17c0..2cee7ae 100755 --- a/reports/issues_stats.pl +++ b/reports/issues_stats.pl @@ -22,7 +22,6 @@ use warnings; use CGI qw ( -utf8 ); use Date::Manip; -use Text::Unaccent; use C4::Auth; use C4::Debug; @@ -337,7 +336,7 @@ sub calculate { $linefilter[0] =~ s/\*/%/g; $strsth .= " AND $line LIKE ? "; } - $strsth .= " group by $linefield order by $lineorder "; + $strsth .= " group by $linefield collate utf8_bin order by $lineorder "; $debug and warn $strsth; push @loopfilter, { crit => 'SQL =', sql => 1, filter => $strsth }; my $sth = $dbh->prepare($strsth); @@ -426,7 +425,7 @@ sub calculate { $strsth2 .= " AND $column LIKE ? " ; } - $strsth2 .= " group by $colfield order by $colorder "; + $strsth2 .= " group by $colfield collate utf8_bin order by $colorder "; $debug and warn $strsth2; push @loopfilter, { crit => 'SQL =', sql => 1, filter => $strsth2 }; my $sth2 = $dbh->prepare($strsth2); @@ -555,6 +554,7 @@ sub calculate { } else { $strcalc .= " $colfield "; } + $strcalc .= " collate utf8_bin "; $strcalc .= " ORDER BY "; if($line_attribute_type) { @@ -641,24 +641,24 @@ sub null_to_zzempty { sub table_set { my ($table, $row, $col, $val) = @_; - $row = lc(unac_string('utf-8', $row // '')); - $col = lc(unac_string('utf-8', $col // '')); + $row = $row // ''; + $col = $col // ''; $table->{ null_to_zzempty($row) }->{ null_to_zzempty($col) } = $val; } sub table_get { my ($table, $row, $col) = @_; - $row = lc(unac_string('utf-8', $row // '')); - $col = lc(unac_string('utf-8', $col // '')); + $row = $row // ''; + $col = $col // ''; return $table->{ null_to_zzempty($row) }->{ null_to_zzempty($col) }; } sub table_inc { my ($table, $row, $col, $inc) = @_; - $row = lc(unac_string('utf-8', $row // '')); - $col = lc(unac_string('utf-8', $col // '')); + $row = $row // ''; + $col = $col // ''; $table->{ null_to_zzempty($row) }->{ null_to_zzempty($col) } += $inc; } -- 2.1.4