Changeset 6274

Timestamp:

2003-12-16T11:45:36+13:00 (20 years ago)

Author:

kjdon

Message:

was using old system messages to reload/delete collections

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Construct.java (modified) (4 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -192 +192 @@
     // once have got here, we assume
     // the first bit proceeded successfully, now reload the collection
-    configureRequest("reload", coll_name, status, lang); // this will append more messages to the status, and overwrite the error code att
+    systemRequest("reload", coll_name, status, lang); // this will append more messages to the status, and overwrite the error code att
     return response;
     
@@ -241 +241 @@
         return response;
     }
-    configureRequest("delete", coll_name, status, lang);
+    systemRequest("delete", coll_name, status, lang);
     return response;
     }
@@ -275 +275 @@
     
     String coll_name = (String)params.get(COL_PARAM);
-    configureRequest("reload", coll_name, status, lang);
+    systemRequest("reload", coll_name, status, lang);
     return response;    
     
@@ -284 +284 @@
      * response will be put into the status element
      */
-    protected void configureRequest(String action_name, String coll_name, Element status, String lang) {
+    protected void systemRequest(String action_name, String coll_name, Element status, String lang) {
     
     // send the request to the MR
     Element message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     Element request = this.doc.createElement(GSXML.REQUEST_ELEM);
-    request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_CONFIGURE);
+    request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_SYSTEM);
     request.setAttribute(GSXML.TO_ATT, "");
     message.appendChild(request);
-    Element command = this.doc.createElement(GSXML.CONFIGURE_ELEM);
-    command.setAttribute(GSXML.TYPE_ATT, GSXML.COLLECTION_ELEM);
-    command.setAttribute(GSXML.NAME_ATT, coll_name);
+    Element command = this.doc.createElement(GSXML.SYSTEM_ELEM);
+    request.appendChild(command);
+    command.setAttribute(GSXML.SYSTEM_MODULE_TYPE_ATT, GSXML.COLLECTION_ELEM);
+    command.setAttribute(GSXML.SYSTEM_MODULE_NAME_ATT, coll_name);
+
     if (action_name.equals("delete")) {
-        command.setAttribute(GSXML.ACTION_ATT, GSXML.CONFIG_ACTION_DEACTIVATE);
+        command.setAttribute(GSXML.TYPE_ATT, GSXML.SYSTEM_TYPE_DEACTIVATE);
     } else if (action_name.equals("reload")) {
-        command.setAttribute(GSXML.ACTION_ATT, GSXML.CONFIG_ACTION_ACTIVATE);
+        command.setAttribute(GSXML.TYPE_ATT, GSXML.SYSTEM_TYPE_ACTIVATE);
     } else {
-        System.err.println("invalid action name passed to configureRequest:"+action_name);
+        System.err.println("invalid action name passed to systemRequest:"+action_name);
         return;
     }