[open-ils-commits] r15556 - branches/rel_1_6_0/Open-ILS/src/perlmods/OpenILS/WWW (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-02-16 12:04:32 -0500 (Tue, 16 Feb 2010)
New Revision: 15556

Modified:
   branches/rel_1_6_0/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm
Log:
Backport r15554 from trunk: Double-decoding the UTF8 for SRU no longer seems necessary with current Debian Lenny packages 


Modified: branches/rel_1_6_0/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm
===================================================================
--- branches/rel_1_6_0/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm	2010-02-16 17:03:40 UTC (rev 15555)
+++ branches/rel_1_6_0/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm	2010-02-16 17:04:32 UTC (rev 15556)
@@ -1631,12 +1631,12 @@
 
 	if ( $resp->type eq 'searchRetrieve' ) {
 
-		# These terms are arriving to us double-encoded, so until we
-		# figure out where in the CGI/SRU chain that's happening, we
-		# have to # forcefully double-decode them a second time with
-		# the outer decode('utf8', $string) call
-		my $cql_query = decode('utf8', decode_utf8($req->query));
-		my $search_string = decode('utf8', decode_utf8($req->cql->toEvergreen));
+		# Older versions of Debian packages returned terms to us double-encoded,
+		# so we had to forcefully double-decode them a second time with
+		# an outer decode('utf8', $string) call; this seems to be resolved with
+		# Debian Lenny packages sometime between 2009-07-27 and 2010-02-15
+		my $cql_query = decode_utf8($req->query);
+		my $search_string = decode_utf8($req->cql->toEvergreen);
 
 		# Ensure the search string overrides the default site
 		if ($shortname and $search_string !~ m#site:#) {