Changeset 6695

Timestamp:

2004-02-02T15:53:45+13:00 (20 years ago)

Author:

nzdl

Message:

all request creation now done through GSXML.createBasicRequest - we can enforce certain atts this way

Location:

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

Files:

• action/BrowseAction.java (modified) (3 diffs)
• action/GS2BrowseAction.java (modified) (3 diffs)
• action/ProcessAction.java (modified) (1 diff)
• action/QueryAction.java (modified) (1 diff)
• core/MessageRouter.java (modified) (1 diff)
• service/GS2Construct.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/BrowseAction.java

@@ -126 +126 @@
     // get the browse structure for the selected node
     Element classify_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-    Element classify_request = this.doc.createElement(GSXML.REQUEST_ELEM);
+    Element classify_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     classify_message.appendChild(classify_request);
-        
-    classify_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
-    classify_request.setAttribute(GSXML.TO_ATT, to);
-    classify_request.setAttribute(GSXML.LANG_ATT, lang);
-    
         
     //Create a parameter list to specify the required structure information
@@ -196 +191 @@
     if (cl_nodes.getLength() > 0) {
         did_classifier = true;
-        Element cl_meta_request = this.doc.createElement(GSXML.REQUEST_ELEM);
+        Element cl_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to+"MetadataRetrieve", lang, uid);
         metadata_message.appendChild(cl_meta_request);
-        cl_meta_request.setAttribute(GSXML.TO_ATT, to+"MetadataRetrieve");
-        cl_meta_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
-        cl_meta_request.setAttribute(GSXML.LANG_ATT, lang);
         
         Element new_cl_nodes_list = this.doc.createElement(GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
@@ -236 +228 @@
     if (doc_nodes.getLength() > 0) {
         did_documents = true;
-        Element doc_meta_request = this.doc.createElement(GSXML.REQUEST_ELEM);
+        Element doc_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, GSPath.appendLink(collection, "DocumentMetadataRetrieve"), lang, uid);
         metadata_message.appendChild(doc_meta_request);
-        doc_meta_request.setAttribute(GSXML.TO_ATT, GSPath.appendLink(collection, "DocumentMetadataRetrieve"));
-        doc_meta_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
-        doc_meta_request.setAttribute(GSXML.LANG_ATT, lang);
         
         Element doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/GS2BrowseAction.java

@@ -130 +130 @@
     // get the browse structure for the selected node
     Element classify_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-    Element classify_request = this.doc.createElement(GSXML.REQUEST_ELEM);
+    Element classify_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     classify_message.appendChild(classify_request);
-        
-    classify_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
-    classify_request.setAttribute(GSXML.TO_ATT, to);
-    classify_request.setAttribute(GSXML.LANG_ATT, lang);
-    
         
     //Create a parameter list to specify the required structure information
@@ -226 +221 @@
     if (cl_nodes.getLength() > 0) {
         did_classifier = true;
-        Element cl_meta_request = this.doc.createElement(GSXML.REQUEST_ELEM);
+        Element cl_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to+"MetadataRetrieve", lang, uid);
         metadata_message.appendChild(cl_meta_request);
-        cl_meta_request.setAttribute(GSXML.TO_ATT, to+"MetadataRetrieve");
-        cl_meta_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
-        cl_meta_request.setAttribute(GSXML.LANG_ATT, lang);
         
         Element new_cl_nodes_list = this.doc.createElement(GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
@@ -256 +248 @@
     if (doc_nodes.getLength() > 0) {
         did_documents = true;
-        Element doc_meta_request = this.doc.createElement(GSXML.REQUEST_ELEM);
+        Element doc_meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, GSPath.appendLink(collection, "DocumentMetadataRetrieve"), lang, uid);
         metadata_message.appendChild(doc_meta_request);
-        doc_meta_request.setAttribute(GSXML.TO_ATT, GSPath.appendLink(collection, "DocumentMetadataRetrieve"));
-        doc_meta_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
-        doc_meta_request.setAttribute(GSXML.LANG_ATT, lang);
         
         Element doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/ProcessAction.java

@@ -100 +100 @@
     // request the service info for the selected service - should be cached
     Element mr_info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-    Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, uid); //.createElement(GSXML.REQUEST_ELEM);
+    Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, uid);
     mr_info_message.appendChild(mr_info_request);
     Element mr_info_response = (Element) this.mr.process(mr_info_message);

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/QueryAction.java

@@ -147 +147 @@
     // do the metadata request on the filtered list
     Element mr_metadata_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-    Element mr_metadata_request = this.doc.createElement(GSXML.REQUEST_ELEM);
+    to = GSPath.appendLink(collection, "DocumentMetadataRetrieve"); // Hard-wired?
+    Element mr_metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     mr_metadata_message.appendChild(mr_metadata_request);
     
-    mr_metadata_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
-    mr_metadata_request.setAttribute(GSXML.LANG_ATT, lang);
-    to = GSPath.appendLink(collection, "DocumentMetadataRetrieve"); // Hard-wired?
-    mr_metadata_request.setAttribute(GSXML.TO_ATT, to);
-
     // just get all for now - the receptionist should perhaps pass in some
     // metadata that it wants, and QueryAction should look through the format stuff to see if there is any other?

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

@@ -460 +460 @@
 
     Element info_request = this.doc.createElement(GSXML.MESSAGE_ELEM);
-    Element req = this.doc.createElement(GSXML.REQUEST_ELEM);
+    Element req = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", "", "");
     info_request.appendChild(req);
-    req.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
 
     // process the message

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

@@ -288 +288 @@
     // 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_SYSTEM);
-    request.setAttribute(GSXML.TO_ATT, "");
+    Element request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_SYSTEM, "", lang, "");
     message.appendChild(request);
     Element command = this.doc.createElement(GSXML.SYSTEM_ELEM);