Changeset 32110 for gs3-extensions/solr/trunk/src/src/java/org/greenstone/solrserver/Greenstone3SearchHandler.java

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:

• gs3-extensions/solr/trunk/src/src/java/org/greenstone/solrserver/Greenstone3SearchHandler.java (modified) (3 diffs)

gs3-extensions/solr/trunk/src/src/java/org/greenstone/solrserver/Greenstone3SearchHandler.java

@@ -77 +77 @@
 public class Greenstone3SearchHandler extends SearchHandler
 {
-    // IMPORTANT NOTE: Logging doesn't work in this class either with log4j or slf4j, 
+    // IMPORTANT NOTES: 1. Logging doesn't work in this class either with log4j or slf4j, 
     // but System.err goes to catalina.out.
+    // 2. To compile this class, "ant compile" in ext/solr is insufficient. The class file produced
+    // isn't copied into tomcat. Need to do "ant compile-gs3-solrserver".
 
     //protected static Logger log = LoggerFactory.getLogger(Greenstone3SearchHandler.class);
@@ -157 +159 @@
 
     if(query_string == null || query_string.equals("")) {
-        log.error("@@@@@@@@@ " + this.getClass() + " - QUERY STRING EMPTY");
+        //log.error("@@@@@@@@@ " + this.getClass() + " - QUERY STRING EMPTY"); // logging won't work
+        System.err.println("@@@@@@@@@ " + this.getClass() + " - QUERY STRING EMPTY");
     }
     else {
@@ -234 +237 @@
 
         // totaltermfreq(TI, 'farming') 
-        // termfreq(TI, 'farming')      
+        // termfreq(TI, 'farming')
+        //System.err.println("@@@@ SOLR FACET queryTerm: " + queryTerm);
         solrParams.addField("totaltermfreq(" + field + ",'" + queryTerm + "')");
         solrParams.addField("termfreq(" + field + ",'" + queryTerm + "')");
+
+        // handle the special case of apostrophes in facet query terms
+        // (facet_scripts.js does the other half of handling them)
+        query_string = query_string.replace("%27", "'");
+        solrParams.set("q", query_string);
+        
+        System.err.println("@@@@ SOLR FACET query_string: " + query_string);
         }
     }