Changeset 3965

Timestamp:

2003-03-25T09:39:29+12:00 (21 years ago)

Author:

kjdon

Message:

document node stuff is now renamed node...

Location:

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

Files:

• BrowseAction.java (modified) (1 diff)
• DocumentAction.java (modified) (5 diffs)

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

@@ -149 +149 @@
     path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
     path = GSPath.appendLink(path, GSXML.CLASS_NODE_ELEM);
-    path = GSPath.appendLink(path, GSXML.DOC_NODE_STRUCTURE_ELEM);
+    path = GSPath.appendLink(path, GSXML.NODE_STRUCTURE_ELEM);
     // assume that we always get back the top level CL1 node - want to throw this away
     path = GSPath.appendLink(path, GSXML.CLASS_NODE_ELEM);

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

@@ -102 +102 @@
     Element ds_doc = doc_.createElement(GSXML.DOC_NODE_ELEM);
     ds_doc_list.appendChild(ds_doc);
-    ds_doc.setAttribute(GSXML.DOC_NODE_ID_ATT, document_name);
+    ds_doc.setAttribute(GSXML.NODE_ID_ATT, document_name);
     
     // Process the document structure retrieve message
@@ -112 +112 @@
     String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     path = GSPath.appendLink(path, GSXML.DOC_NODE_ELEM);
-    path = GSPath.appendLink(path, GSXML.DOC_NODE_STRUCTURE_ELEM);
+    path = GSPath.appendLink(path, GSXML.NODE_STRUCTURE_ELEM);
     Element ds_response_structure = (Element) GSXML.getNodeByPath(ds_response_message, path);
 
@@ -149 +149 @@
     for (int i = 0; i < doc_nodes.getLength(); i++) {
         Element doc_node = (Element) doc_nodes.item(i);
-        String doc_node_id = doc_node.getAttribute(GSXML.DOC_NODE_ID_ATT);
+        String doc_node_id = doc_node.getAttribute(GSXML.NODE_ID_ATT);
 
         // Add the documentNode to the list
         Element dm_doc_node = doc_.createElement(GSXML.DOC_NODE_ELEM);
         dm_doc_list.appendChild(dm_doc_node);
-        dm_doc_node.setAttribute(GSXML.DOC_NODE_ID_ATT, doc_node_id);
-        dm_doc_node.setAttribute(GSXML.DOC_NODE_TYPE_ATT,
-                     doc_node.getAttribute(GSXML.DOC_NODE_TYPE_ATT));
+        dm_doc_node.setAttribute(GSXML.NODE_ID_ATT, doc_node_id);
+        dm_doc_node.setAttribute(GSXML.NODE_TYPE_ATT,
+                     doc_node.getAttribute(GSXML.NODE_TYPE_ATT));
     }
 
@@ -196 +196 @@
     Element dc_response_doc = (Element) GSXML.getNodeByPath(dc_response_message, path);
     //path = GSPath.appendLink(path, GSXML.DOC_NODE_CONTENT_ELEM);
-    Element dc_response_doc_content = (Element) GSXML.getChildByTagName(dc_response_doc, GSXML.DOC_NODE_CONTENT_ELEM);
+    Element dc_response_doc_content = (Element) GSXML.getChildByTagName(dc_response_doc, GSXML.NODE_CONTENT_ELEM);
     // use the returned id rather than the sent one cos there may have
     // been modifiers such as .pr that are removed.
@@ -203 +203 @@
     for (int i = 0; i < doc_nodes.getLength(); i++) {
         Node doc_node = doc_nodes.item(i);
-        Node doc_node_id = doc_node.getAttributes().getNamedItem(GSXML.DOC_NODE_ID_ATT);
+        Node doc_node_id = doc_node.getAttributes().getNamedItem(GSXML.NODE_ID_ATT);
         String dc_doc_id = doc_node_id.getNodeValue();
         if (dc_doc_id.equals(modified_doc_id)) {