Changeset 25571 for main

Timestamp:

2012-05-10T17:32:18+12:00 (12 years ago)

Author:

ak19

Message:

Added a ping SystemAction to mirror GS2's updated ability to ping the server as is needed for activate.pl. (GS2 also allows pinging a collection, but that's not been ported to GS3 yet).

Location:

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

Files:

• action/SystemAction.java (modified) (1 diff)
• core/MessageRouter.java (modified) (1 diff)
• util/GSXML.java (modified) (1 diff)

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

@@ -74 +74 @@
             system.setAttribute(GSXML.SYSTEM_SUBSET_ATT, info);
         }
+        else if (subaction.equals("ping")){
+            // No pinging on collections yet in GS3 as is there in GS2
+            // The ping subaction is at present just for activate.pl
+            system.setAttribute(GSXML.TYPE_ATT, GSXML.SYSTEM_TYPE_PING);
+        }
+        //else if (subaction.equals("is-persistent")){
+        //  system.setAttribute(GSXML.TYPE_ATT, GSXML.SYSTEM_TYPE_ISPERSISTENT);
+        //}
         else
         {

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -974 +974 @@
         Element elem = (Element)commands.item(i);
         String action = elem.getAttribute(GSXML.TYPE_ATT);
-        if (action.equals(GSXML.SYSTEM_TYPE_CONFIGURE)) {
+        if (action.equals(GSXML.SYSTEM_TYPE_PING)) {
+            Element s = GSXML.createTextElement(this.doc, GSXML.STATUS_ELEM,  "Ping succeeded.");
+            response.appendChild(s);
+        }
+        //if (action.equals(GSXML.SYSTEM_TYPE_ISPERSISTENT)) {
+        //  Element s = GSXML.createTextElement(this.doc, GSXML.STATUS_ELEM,  "Persistent: true.");
+        //  response.appendChild(s);
+        //}
+        else if (action.equals(GSXML.SYSTEM_TYPE_CONFIGURE)) {
           String subset = elem.getAttribute(GSXML.SYSTEM_SUBSET_ATT);
           if (subset.equals("")) {

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java

@@ -233 +233 @@
     public static final String SYSTEM_TYPE_ACTIVATE = "activate";
     public static final String SYSTEM_TYPE_DEACTIVATE = "deactivate";
+    public static final String SYSTEM_TYPE_PING = "ping";
+    //public static final String SYSTEM_TYPE_ISPERSISTENT = "is-persistent";
 
     public static final String SYSTEM_SUBSET_ATT = "subset";