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

Timestamp:

2012-05-11T22:10:15+12:00 (12 years ago)

Author:

ak19

Message:

SystemAction now supports pinging on a collection with ?a=s&sa=ping&st=collection&sn=colName

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/SystemAction.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
+        else if (subaction.equals("ping")) { // can ping the server or a collection
+            String name = (String) params.get(GSParams.SYSTEM_MODULE_NAME);
+            
+            if(name != null && !name.equals("")) { 
+                // Pinging a collection (or module) with ?a=s&sa=ping&st=collection&sn=<colName>
+                // is a collection-level (servicecluster/module level) ping
+                
+                String type = (String) params.get(GSParams.SYSTEM_MODULE_TYPE);
+                if(type == null || type.equals("")) { 
+                    type = "collection"; // if the st=collection was omitted, assume collection
+                }               
+                // ping action set to moduleType=Collection and moduleName=colName
+                system.setAttribute(GSXML.SYSTEM_MODULE_NAME_ATT, name);
+                system.setAttribute(GSXML.SYSTEM_MODULE_TYPE_ATT, type);
+                system.setAttribute(GSXML.TYPE_ATT, GSXML.SYSTEM_TYPE_PING);
+            } // else SYSTEM_MODULE_NAME given by the "sn" GSParam is null or empty 
+              // meaning server-level ping: ?a=s&sa=ping
+              
             system.setAttribute(GSXML.TYPE_ATT, GSXML.SYSTEM_TYPE_PING);
         }