Changeset 30057 for gs3-extensions/solr

Timestamp:

2015-07-25T07:27:52+12:00 (9 years ago)

Author:

Georgiy Litvinov

Message:

Solr repo fixes for highlighting bug.

Location:

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3

Files:

• service/GS2SolrRetrieve.java (modified) (2 diffs)
• service/GS2SolrSearch.java (modified) (1 diff)
• util/SolrQueryWrapper.java (modified) (1 diff)

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

@@ -20 +20 @@
 
 import org.apache.log4j.Logger;
+import org.greenstone.gsdl3.core.GSException;
+import org.greenstone.gsdl3.util.GSXML;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
 
 /** Does excatly the same as GS2LuceneRetrieve.  Wrap up in a bit of
@@ -37 +42 @@
     super();
     }
+    @Override
+    protected Element getNodeContent(Document doc, String doc_id, String lang) throws GSException
+    {
+     // IF we need only process our content by macro resolver
+        if (highlightedNode != null) 
+        {
+            String highlightedTextContent = highlightedNode.getTextContent();
+            
+            //Process text
+            highlightedTextContent = resolveTextMacros(highlightedTextContent, doc_id, lang);
+            //Create result element
+            Element highlighted_node = doc.createElement(GSXML.NODE_CONTENT_ELEM);
+            Text hlt = doc.createTextNode(highlightedTextContent);
+            highlighted_node.appendChild(hlt);
+            return highlighted_node;
+        }
+        return super.getNodeContent(doc, doc_id, lang);
+    
+    }
 }
 

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

@@ -348 +348 @@
             {
                 String rslt = this.solr_src.runHighlightingQuery(query,hldocOID);
+                // Check result
+                if (rslt != null)
+                {
                 return rslt;
+                }
+                //Highlighting request failed. Do standard request.
+                hldocOID = null;
             }
             SharedSoleneQueryResult sqr = this.solr_src.runQuery(query);

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

@@ -559 +559 @@
             //Get highliting results
             Map<String,Map<String,List<String>>> highlightingResults = solrResponse.getHighlighting();
-            //Get highlited document text
-            text = highlightingResults.get(hldocOID).get(highlight_field).get(0);
-            
-                                                
+            // Check for existing highlighting results
+            if (highlightingResults != null && highlightingResults.get(hldocOID) != null && highlightingResults.get(hldocOID).get(highlight_field) != null) 
+            {
+                //Get highlited document text
+                text = highlightingResults.get(hldocOID).get(highlight_field).get(0);
+            }
         }
         catch (SolrServerException server_exception)