Changeset 6299 for trunk/gsdl3

Timestamp:

2003-12-18T09:23:27+13:00 (20 years ago)

Author:

kjdon

Message:

GSXML.createBasicRequest now expects a user id, also replaced some strings with constants

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3

Files:

• collection/ServiceCluster.java (modified) (4 diffs)
• core/MessageRouter.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

@@ -248 +248 @@
         // services it provides
         Element message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-        Element request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", "");
+        Element request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", "", "");
         message.appendChild(request);
 
@@ -433 +433 @@
         Element elem = (Element)commands.item(i);
         String action = elem.getAttribute(GSXML.TYPE_ATT);
-        if (action.equals("configure")) {
+        if (action.equals(GSXML.SYSTEM_TYPE_CONFIGURE)) {
         String subset = elem.getAttribute(GSXML.SYSTEM_SUBSET_ATT);
         if (subset.equals("")) {
@@ -458 +458 @@
         String module_name = elem.getAttribute(GSXML.SYSTEM_MODULE_NAME_ATT);
         String module_type = elem.getAttribute(GSXML.SYSTEM_MODULE_TYPE_ATT);
-        if (action.equals("activate")) {
+        if (action.equals(GSXML.SYSTEM_TYPE_ACTIVATE)) {
         Element s = GSXML.createTextElement(this.doc, GSXML.STATUS_ELEM, "activate action not yet implemented - does it even make sense in this context??");
         response.appendChild(s);
-        } else if (action.equals("deactivate")) {
+        } else if (action.equals(GSXML.SYSTEM_TYPE_DEACTIVATE)) {
         if (module_type.equals(GSXML.SERVICE_ELEM)) {
             // deactivate the service
@@ -489 +489 @@
     if (!configFile.exists() ) {
         System.err.println("ServiceCluster: site config file: "+configFile.getPath()+" not found!");
-        // wont be able to do any of teh requests
+        // wont be able to do any of the requests
         return false;
         

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

@@ -308 +308 @@
         
     Element service_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-    Element service_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", "");
+    Element service_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", "", "");
     service_message.appendChild(service_request);
         
@@ -572 +572 @@
         Element elem = (Element)commands.item(i);
         String action = elem.getAttribute(GSXML.TYPE_ATT);
-        if (action.equals("configure")) {
+        if (action.equals(GSXML.SYSTEM_TYPE_CONFIGURE)) {
             String subset = elem.getAttribute(GSXML.SYSTEM_SUBSET_ATT);
             if (subset.equals("")) {
@@ -624 +624 @@
             String module_type = elem.getAttribute(GSXML.SYSTEM_MODULE_TYPE_ATT);
 
-            if (action.equals("deactivate")) {
+            if (action.equals(GSXML.SYSTEM_TYPE_DEACTIVATE)) {
             deactivateModule(module_type, module_name);
             Element s = GSXML.createTextElement(this.doc, GSXML.STATUS_ELEM, module_type+": "+module_name+" deactivated");
             response.appendChild(s);
-            } else if (action.equals("activate")) {
+            } else if (action.equals(GSXML.SYSTEM_TYPE_ACTIVATE)) {
             if (module_type.equals(GSXML.COLLECTION_ELEM)) {
                 success = activateCollection(module_name);