Changeset 30056

Timestamp:

2015-07-25T07:25:11+12:00 (8 years ago)

Author:

Georgiy Litvinov

Message:

Fixes for highlighting bug.

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• action/DocumentAction.java (modified) (1 diff)
• service/AbstractDocumentRetrieve.java (modified) (3 diffs)

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

@@ -881 +881 @@
         if (highlighted_Node != null)
         {
-            return highlighted_Node;
+            // Build a request to process highlighted text
+            
+            Element hl_message = doc.createElement(GSXML.MESSAGE_ELEM);
+            to = GSPath.appendLink(collection, "DocumentContentRetrieve");
+            Element dc_request = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
+            hl_message.appendChild(dc_request);
+
+            // Create a parameter list to specify the request parameters - empty for now
+            Element dc_param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+            dc_request.appendChild(dc_param_list);
+
+            // get the content
+            Element doc_list = doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+            dc_request.appendChild(doc_list);
+            Element current_doc = doc.createElement(GSXML.DOC_NODE_ELEM);
+            doc_list.appendChild(current_doc);
+            current_doc.setAttribute(GSXML.NODE_ID_ATT, (String) params.get(GSParams.DOCUMENT));
+            //Append highlighted content to request for processing
+            dc_request.appendChild(doc.importNode(highlighted_Node, true));
+                            
+            Element hl_response_message = (Element) this.mr.process(hl_message);
+            //Get results
+            NodeList contentList = hl_response_message.getElementsByTagName(GSXML.NODE_CONTENT_ELEM);
+            Element content = (Element) contentList.item(0);    
+            return content;
         }
 

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractDocumentRetrieve.java

@@ -36 +36 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+
 
 // General Java classes
@@ -86 +88 @@
     protected boolean does_structure = true;
 
+    protected Element highlightedNode = null;
     /** constructor */
     public AbstractDocumentRetrieve()
@@ -550 +553 @@
         result.setAttribute(GSXML.FROM_ATT, DOCUMENT_CONTENT_RETRIEVE_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
-
+        //import highlighted node to result
+        highlightedNode = (Element) GSXML.getChildByTagName(request, GSXML.NODE_CONTENT_ELEM);
+        
         if (!does_content)
         {