Changeset 4858

Timestamp:

2003-07-02T16:39:05+12:00 (21 years ago)

Author:

kjdon

Message:

simple doc types with no sections are returned a bit differently - have document/metadataList and nodeContent, rather than document/documentNode/metadataList and nodeContent

File:

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

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

@@ -70 +70 @@
     }
     String document_type = (String) params.get(DOC_TYPE_ARG);
+    if (document_type == null) {
+        document_type = "simple";
+    }
     //whether to retrieve siblings or not
     boolean get_siblings = false;
@@ -79 +82 @@
     // get the additional data needed for the page
     getBackgroundData(page_response, collection, lang);
-
+    Element format_elem = (Element)GSXML.getChildByTagName(page_response, GSXML.FORMAT_ELEM);
+    
     // the_document is where all the doc info - structure and metadata etc
     // is added into, to be returned in the page
@@ -137 +141 @@
     }
 
-    boolean dummy_node = false;
+    boolean has_dummy = false;
     if (get_structure || get_structure_info) {
 
@@ -178 +182 @@
         doc_node.setAttribute(GSXML.NODE_ID_ATT, document_name);
         the_document.appendChild(doc_node);
-        dummy_node = true;
-        }
-    } else {
+        has_dummy = true;
+        }
+    } else { // a simple type - we dont have a dummy node for simple
+        // should think about this more
         // no structure request, so just put in a dummy doc node
         Element doc_node = doc_.createElement(GSXML.DOC_NODE_ELEM);
         doc_node.setAttribute(GSXML.NODE_ID_ATT, document_name);
         the_document.appendChild(doc_node);
-        dummy_node = true;
+        has_dummy = true;
     }
     
@@ -194 +199 @@
     dm_message.appendChild(dm_request);
     // Create a parameter list to specify the required metadata information
-    // for now get Title
-    Element dm_param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    
+    HashSet meta_names = new HashSet();
+    meta_names.add("Title"); // the default
+    if (format_elem != null) {
+        extractMetadataNames(format_elem, meta_names);
+    }
+    
+    Element dm_param_list = createMetadataParamList(meta_names);
     dm_request.appendChild(dm_param_list);
-    Element dm_param = doc_.createElement(GSXML.PARAM_ELEM);
-    dm_param_list.appendChild(dm_param);
-    dm_param.setAttribute(GSXML.NAME_ATT, "metadata");
-    dm_param.setAttribute(GSXML.VALUE_ATT, "all");
-
+    
     // create the doc node list for the metadata request
     Element dm_doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
@@ -269 +276 @@
 
     Element dc_response_message = (Element) mr_.process(dc_message);
-    
     path = GSPath.appendLink(path, GSXML.DOC_NODE_ELEM);
     Element dc_response_doc = (Element) GSXML.getNodeByPath(dc_response_message, path);
     Element dc_response_doc_content = (Element) GSXML.getChildByTagName(dc_response_doc, GSXML.NODE_CONTENT_ELEM);
+    
             
     boolean highlight_query_terms = true;
@@ -307 +314 @@
     String modified_doc_id = dc_response_doc.getAttribute(GSXML.NODE_ID_ATT);
     the_document.setAttribute("selectedNode", modified_doc_id);
-    if (dummy_node) {
+    if (has_dummy) {
         // change the id if necessary and add the content
-        ((Element)doc_nodes.item(0)).setAttribute(GSXML.NODE_ID_ATT, modified_doc_id);
-        doc_nodes.item(0).appendChild(doc_.importNode(dc_response_doc_content, true));
+        Element dummy_node = (Element)doc_nodes.item(0);
+        
+        dummy_node.setAttribute(GSXML.NODE_ID_ATT, modified_doc_id);
+        dummy_node.appendChild(doc_.importNode(dc_response_doc_content, true));
+        // hack for simple type
+        if (document_type.equals("simple")) {
+        // we dont want the internal docNode, just want the content and metadata in the document
+        // rethink this!!
+        the_document.removeChild(dummy_node);
+
+        NodeList dummy_children = dummy_node.getChildNodes();
+        //for (int i=0; i<dummy_children.getLength(); i++) {
+        for (int i=dummy_children.getLength()-1; i>=0; i--) {
+            the_document.appendChild(dummy_children.item(i));
+            
+        }
+        }
     } else {
         // Merge the document content with the metadata and structure information
@@ -323 +345 @@
     }
 
-    System.out.println("(DocumentAction) Page:\n" + converter_.getPrettyString(result));
+    ///ystem.out.println("(DocumentAction) Page:\n" + converter_.getPrettyString(result));
     return result;
     }