Changeset 3896

Timestamp:

2003-03-18T15:02:23+12:00 (21 years ago)

Author:

kjdon

Message:

added sib arg - if set to 1, get the siblings of a selected node. also tidied up the code a bit

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/DocumentAction.java (modified) (9 diffs)

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

@@ -38 +38 @@
 public class DocumentAction extends Action {
   
+    // this is used to specify that the sibling nodes of a selected one should be obtained
+    public static final String SIBLING_ARG = "sib";
+
+    /* add the action specific args to the cgi param list
+     */
+    public void addCGIParams() {
+    cgi_.addStaticParam(SIBLING_ARG);
+    }
+
+
     public Element process (Element message)
     {
@@ -54 +64 @@
         return null;
     }
-
-
+    //whether to retrieve siblings or not
+    boolean get_siblings = false;
+    String sibs = (String) params.get(SIBLING_ARG);
+    if (sibs != null && sibs.equals("1")) {
+        get_siblings = true;
+    }
+    
     // Build a request to obtain the document structure
     Element ds_message = doc_.createElement(GSXML.MESSAGE_ELEM);
@@ -76 +91 @@
     ds_param.setAttribute(GSXML.NAME_ATT, "structure");
     ds_param.setAttribute(GSXML.VALUE_ATT, "children");
-
+    if (get_siblings) {
+        ds_param = doc_.createElement(GSXML.PARAM_ELEM);
+        ds_param_list.appendChild(ds_param);
+        ds_param.setAttribute(GSXML.NAME_ATT, "structure");
+        ds_param.setAttribute(GSXML.VALUE_ATT, "siblings");
+    }
     // create a doc_node_list and put in the doc_node that we are interested in
     Element ds_doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
@@ -102 +122 @@
         the_document.appendChild(doc_.importNode(structs.item(i), true));
     }
-    //Element ds_response = (Element) GSXML.getChildByTagName(ds_response_message, GSXML.RESPONSE_ELEM);
-    //Element ds_response_doc_list = (Element) GSXML.getChildByTagName(ds_response, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER); 
-    //Element ds_response_document = (Element) GSXML.getChildByTagName(ds_response_doc_list, GSXML.DOC_NODE_ELEM); 
-
-    // Detach the document from the list, remove the list, and add the document back
-    // ds_response is the re
-    //ds_response.removeChild(ds_response_doc_list);
-    //ds_response.appendChild(ds_response_document);
-
 
     // Build a request to obtain some document metadata
@@ -155 +166 @@
     Element dm_response_doc_list = (Element) GSXML.getNodeByPath(dm_response_message, path);
 
-    //Element dm_response_content = (Element) GSXML.getNodeByPath(dm_response, "response/content");
-    //Element dm_response_doc_list = (Element) GSXML.getNodeByPath(dm_response_content, "documentList");
-
     // Merge the metadata with the structure information
     NodeList dm_response_docs = dm_response_doc_list.getChildNodes();
@@ -180 +188 @@
     // the doc list for the content request is the same as the one for the structure request
     dc_request.appendChild(ds_doc_list);
-//      Element dc_doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
-//      dc_request.appendChild(dc_doc_list);
-//      Element dc_doc = doc_.createElement(GSXML.DOC_NODE_ELEM);
-//      dc_doc_list.appendChild(dc_doc);
-//      dc_doc.setAttribute(GSXML.DOC_NODE_ID, document_name);
 
     // System.out.println("(DocumentAction) Content request:\n" + converter_.getString(dc_request));
@@ -191 +194 @@
     
     path = GSPath.appendLink(path, GSXML.DOC_NODE_ELEM);
-    path = GSPath.appendLink(path, GSXML.DOC_NODE_CONTENT_ELEM);
-    Element dc_response_doc_content = (Element) GSXML.getNodeByPath(dc_response_message, path);
-
+    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);
+    // use the returned id rather than the sent one cos there may have
+    // been modifiers such as .pr that are removed.
+    String modified_doc_id = dc_response_doc.getAttribute(GSXML.NODE_ID_ATT);
     // Merge the document content with the metadata and structure information
     for (int i = 0; i < doc_nodes.getLength(); i++) {
@@ -199 +205 @@
         Node doc_node_id = doc_node.getAttributes().getNamedItem(GSXML.DOC_NODE_ID_ATT);
         String dc_doc_id = doc_node_id.getNodeValue();
-        if (dc_doc_id == document_name) {
+        if (dc_doc_id.equals(modified_doc_id)) {
         doc_node.appendChild(doc_.importNode(dc_response_doc_content, true));
         break;
@@ -219 +225 @@
     response.appendChild(the_document);
     
-    // System.out.println("Finished page: " + converter_.getString(page));
+     System.out.println("doc action: Finished page: " + converter_.getString(page));