Changeset 4827

Timestamp:

2003-06-27T17:31:46+12:00 (21 years ago)

Author:

kjdon

Message:

fixed a bug to do with paged documents and .fc/ns etc in the oids

File:

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

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

@@ -137 +137 @@
     }
 
+    boolean dummy_node = false;
     if (get_structure || get_structure_info) {
 
@@ -172 +173 @@
             the_document.appendChild(doc_.importNode(structs.item(i), true));
         }
+        } else {
+        // no structure nodes, so 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;
         }
     } else {
@@ -178 +185 @@
         doc_node.setAttribute(GSXML.NODE_ID_ATT, document_name);
         the_document.appendChild(doc_node);
+        dummy_node = true;
     }
     
@@ -299 +307 @@
     String modified_doc_id = dc_response_doc.getAttribute(GSXML.NODE_ID_ATT);
     the_document.setAttribute("selectedNode", modified_doc_id);
-    // Merge the document content with the metadata and structure information
-    for (int i = 0; i < doc_nodes.getLength(); i++) {
-        Node dn = doc_nodes.item(i);
-        String dn_id = ((Element)dn).getAttribute(GSXML.NODE_ID_ATT);
-        if (dn_id.equals(modified_doc_id)) {
-        dn.appendChild(doc_.importNode(dc_response_doc_content, true));
-        break;
+    if (dummy_node) {
+        // 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));
+    } else {
+        // Merge the document content with the metadata and structure information
+        for (int i = 0; i < doc_nodes.getLength(); i++) {
+        Node dn = doc_nodes.item(i);
+        String dn_id = ((Element)dn).getAttribute(GSXML.NODE_ID_ATT);
+        if (dn_id.equals(modified_doc_id)) {
+            dn.appendChild(doc_.importNode(dc_response_doc_content, true));
+            break;
+        }
         }
     }