Changeset 32110 for main/trunk/greenstone3/web/interfaces

Timestamp:

2018-01-24T20:46:30+13:00 (6 years ago)

Author:

ak19

Message:

Forgot to commit bugfix. The bug was that when searching a solr collection, if you switch on a facet containing an apostrophe (try searching solr-demo for query term farm and then selecting the facet with apostrophe), there are 0 search results displayed for that facet despite the facet listing a positive number of matching docs for it. 1. Greenstone3SearchHandler.java and facet-scripts.js contain the fix. 2. GS2SolrSearch.java and SolrQueryWrapper.java just contain further debug statements, some commented out.

File:

• main/trunk/greenstone3/web/interfaces/default/js/facet-scripts.js (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/js/facet-scripts.js

@@ -28 +28 @@
         for(var i = 0; i < counts.length; i++)
         {
-            countsStringBuffer += "\"" + encodeURI(counts[i]) + "\"";
+            // escape any apostrophes in facet query terms
+            // (ext/solr's Greenstone3SearchHandler does the other half of handling them)
+            countsStringBuffer += "\"" + encodeURI(counts[i]).replace(/'/g, "%2527") + "\"";
             if(i < counts.length - 1)
             {
@@ -39 +41 @@
     
     console.log("STRING IS " + countsString)
-    
+    
     $.ajax(gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/search/" + gs.cgiParams.s + "?" + searchString + countsString + "excerptid=resultsArea")
         .done(function(response)