From bab92d51e56ade24c89087ded6163ffa43f53915 Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
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=utf8
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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 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 83c485e5d9..25d2278993 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;
@@ -339,7 +338,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);
@@ -428,7 +427,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);
@@ -557,6 +556,7 @@ sub calculate {
     } else {
         $strcalc .= " $colfield ";
     }
+    $strcalc .= " collate utf8_bin ";
 
     $strcalc .= " ORDER BY ";
     if($line_attribute_type) {
@@ -643,24 +643,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.39.5