Changeset 24866

Timestamp:

2011-12-06T13:17:29+13:00 (12 years ago)

Author:

sjm84

Message:

Some fixes to the GeneralAction

File:

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

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

@@ -10 +10 @@
 public class GeneralAction extends Action
 {
+
     /** process a request */
     public Node process(Node message_node)
     {
+
         Element message = this.converter.nodeToElement(message_node);
 
@@ -59 +61 @@
         }
 
-        if (request_type.equals("r"))
+        if (request_type.equals("r") || request_type.equals("s"))
         {
             //do the request
@@ -65 +67 @@
             Element mr_query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
             Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
+            
+            if(request_type.equals("s"))
+            {
+                mr_query_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_STATUS);
+            }
 
             mr_query_message.appendChild(mr_query_request);
@@ -101 +108 @@
         mr_info_message.appendChild(mr_info_request);
         Element mr_info_response = (Element) this.mr.process(mr_info_message);
-
+        
         String path = GSXML.RESPONSE_ELEM;
         path = GSPath.appendLink(path, GSXML.SERVICE_ELEM);
@@ -112 +119 @@
 
         addSiteMetadata(page_response, lang, uid);
+        
         return result;
     }