Double-decoding the UTF8 for SRU no longer seems necessary with current Debian Lenny...
authordbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 16 Feb 2010 17:00:48 +0000 (17:00 +0000)
committerdbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 16 Feb 2010 17:00:48 +0000 (17:00 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@15554 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm

index 30a7c89..00ee6d5 100644 (file)
@@ -1677,12 +1677,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:#) {