Changeset 3976 for trunk/gsdl3/src/java/org/greenstone/gsdl3

Timestamp:

2003-03-25T10:05:54+12:00 (21 years ago)

Author:

kjdon

Message:

docNodeXXX stuff changed to nodeXXX, tidied up from att in response

Location:

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

Files:

• GS2MGPPRetrieve.java (modified) (3 diffs)
• GS2MGRetrieve.java (modified) (3 diffs)
• GS2Retrieve.java (modified) (3 diffs)

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

@@ -86 +86 @@
     // Create a new (empty) result message
     Element result = doc_.createElement(GSXML.RESPONSE_ELEM);
-    String from = GSPath.appendLink(cluster_name_, DOCUMENT_CONTENT_RETRIEVE_SERVICE);
-    result.setAttribute(GSXML.FROM_ATT, from);
+    result.setAttribute(GSXML.FROM_ATT,DOCUMENT_CONTENT_RETRIEVE_SERVICE );
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
 
@@ -112 +111 @@
     // Get the documents
     String[] doc_ids = GSXML.getAttributeValuesFromList(query_doc_list, 
-                             GSXML.DOC_NODE_ID_ATT);
+                             GSXML.NODE_ID_ATT);
     for (int i = 0; i < doc_ids.length; i++) {
         String doc_id = doc_ids[i];
@@ -126 +125 @@
 
         Element doc = doc_.createElement(GSXML.DOC_NODE_ELEM);
-        doc.setAttribute(GSXML.DOC_NODE_ID_ATT, doc_id);
+        doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
         GSXML.addDocText(doc_, doc, doc_content);
         doc_list.appendChild(doc);

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

@@ -85 +85 @@
     // Create a new (empty) result message
     Element result = doc_.createElement(GSXML.RESPONSE_ELEM);
-    String from = GSPath.appendLink(cluster_name_, DOCUMENT_CONTENT_RETRIEVE_SERVICE);
-    result.setAttribute(GSXML.FROM_ATT, from);
+    result.setAttribute(GSXML.FROM_ATT, DOCUMENT_CONTENT_RETRIEVE_SERVICE);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
 
@@ -113 +112 @@
     // Get the documents
     String[] doc_ids = GSXML.getAttributeValuesFromList(query_doc_list, 
-                                 GSXML.DOC_NODE_ID_ATT);
+                                 GSXML.NODE_ID_ATT);
     for (int i = 0; i < doc_ids.length; i++) {
         String doc_id = doc_ids[i];
@@ -123 +122 @@
         // Stick it in a text node 
         Element doc = doc_.createElement(GSXML.DOC_NODE_ELEM);
-        doc.setAttribute(GSXML.DOC_NODE_ID_ATT, doc_id);
+        doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
         GSXML.addDocText(doc_, doc, doc_content);
         doc_list.appendChild(doc);

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

@@ -397 +397 @@
     
     String node_name;
-    String from;
+    String service_name;
     if (type==DOCUMENT) {
-        from = GSPath.appendLink(cluster_name_, DOCUMENT_STRUCTURE_RETRIEVE_SERVICE);
+        service_name = DOCUMENT_STRUCTURE_RETRIEVE_SERVICE;
         node_name = GSXML.DOC_NODE_ELEM;
     } else {
-        from = GSPath.appendLink(cluster_name_, CLASSIFIER_SERVICE);
+        service_name = CLASSIFIER_SERVICE;
         node_name = GSXML.CLASS_NODE_ELEM;
     }
     
-    result.setAttribute(GSXML.FROM_ATT, from);
+    result.setAttribute(GSXML.FROM_ATT, service_name);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
 
@@ -486 +486 @@
         // all structure info goes into a docNodestructure elem
         // classifier elem should be something else???
-        Element structure_elem = doc_.createElement(GSXML.DOC_NODE_STRUCTURE_ELEM);
+        Element structure_elem = doc_.createElement(GSXML.NODE_STRUCTURE_ELEM);
         doc.appendChild(structure_elem);
 
@@ -555 +555 @@
     String node_name;
     
-    String from;
+    String service_name;
     if (type==DOCUMENT) {
-        from = GSPath.appendLink(cluster_name_, DOCUMENT_METADATA_RETRIEVE_SERVICE);
+        service_name = DOCUMENT_METADATA_RETRIEVE_SERVICE; 
         node_name = GSXML.DOC_NODE_ELEM;
     } else {
-        from = GSPath.appendLink(cluster_name_, CLASSIFIER_METADATA_SERVICE);
+        service_name = CLASSIFIER_METADATA_SERVICE; 
         node_name = GSXML.CLASS_NODE_ELEM;
     }
-    result.setAttribute(GSXML.FROM_ATT, from);
+    result.setAttribute(GSXML.FROM_ATT, service_name);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);