From 446d5a9a729986a818f84b1260ec46476f3f0889 Mon Sep 17 00:00:00 2001 From: dbs Date: Tue, 16 Feb 2010 17:04:32 +0000 Subject: [PATCH] Backport r15554 from trunk: Double-decoding the UTF8 for SRU no longer seems necessary with current Debian Lenny packages git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_0@15556 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm b/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm index e6173cf86f..569c7cc47b 100644 --- a/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm +++ b/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm @@ -1631,12 +1631,12 @@ sub sru_search { 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:#) { -- 2.11.0