Changeset 32110

Timestamp:

2018-01-24T20:46:30+13:00 (5 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.

Files:

• gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java (modified) (2 diffs)
• gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/util/SolrQueryWrapper.java (modified) (2 diffs)
• gs3-extensions/solr/trunk/src/src/java/org/greenstone/solrserver/Greenstone3SearchHandler.java (modified) (3 diffs)
• main/trunk/greenstone3/web/interfaces/default/js/facet-scripts.js (modified) (2 diffs)

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java

@@ -330 +330 @@
             else if (name.equals("facetQueries") && value.length() > 0)
             {
+                //logger.info("@@@ SOLR FACET VALUE FOUND: " + value);
                 this.solr_src.addFacetQuery(value);
             }
@@ -410 +411 @@
                 hldocOID = null;
             }
+            //logger.info("@@@@ Query is now: " + query);
             SharedSoleneQueryResult sqr = this.solr_src.runQuery(query);
 

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/util/SolrQueryWrapper.java

@@ -297 +297 @@
                 for (String currentQueryElement : queryElems)
                 {
+                    //logger.info("@@@@ currentQueryElement " + currentQueryElement);
+                    
                     String decodedQueryElement = null;
                     try
@@ -400 +402 @@
             {
               // add this field as a facet
-              solrQuery.addFacetField(_facets.get(i)); // solrParams.add("facet.field", _facets.get(i));
-            }
-        }
-
+                solrQuery.addFacetField(_facets.get(i)); // solrParams.add("facet.field", _facets.get(i));
+            }
+            //for(int i = 0; i < _facetQueries.size(); i++) {
+            //    logger.info("@@@@ facet query i: " + _facetQueries.get(i));
+            //}
+        }
+                
+
+        // Some debugging       
+        logger.info("@@@@ solrQuery: " + solrQuery);        
+        try {
+            // https://stackoverflow.com/questions/2632175/decoding-uri-query-string-in-java
+            String displayQueryString = URLDecoder.decode(solrQuery.toString().replace("+", " "), "UTF-8");
+            logger.info("@@@@ solrQuery URL decoded: " + displayQueryString);
+        } catch(Exception uee) { // UnsupportedEncodingException
+            logger.info("Got debug exception " + uee.getMessage());
+        }
+
+        
         // the solrserver will now
         // get the individual terms that make up the query, then request solr to return the totaltermfreq for each term

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);
         }
     }

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)