Changeset 30049 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

Timestamp:

2015-07-21T05:26:46+12:00 (9 years ago)

Author:

Georgiy Litvinov

Message:

While using Solr field highlighted by Solr Servlet. Also added snippets to search results while using Solr.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

@@ -871 +871 @@
         Element query_param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
         GSXML.addParametersToList(query_param_list, service_params);
+        GSXML.addParameterToList(query_param_list, "hldocOID", (String) params.get(GSParams.DOCUMENT));
         mr_query_request.appendChild(query_param_list);
 
         // do the query
         Element mr_query_response = (Element) this.mr.process(mr_query_message);
+                
+        String pathNode = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.NODE_CONTENT_ELEM);
+        Element highlighted_Node = (Element) GSXML.getNodeByPath(mr_query_response, pathNode);
+        if (highlighted_Node != null)
+        {
+            return highlighted_Node;
+        }
 
         String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.TERM_ELEM + GSXML.LIST_MODIFIER);
@@ -1210 +1218 @@
             content_element.appendChild(doc.createTextNode(remaining_text));
         }
-
         return content_element;
     }