Changeset 23632 for main/branches/64_bit_Greenstone/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

Timestamp:

2011-01-25T14:48:39+13:00 (13 years ago)

Author:

sjm84

Message:

Adding the latest trunk changes as well as tidying up several files and removing more -m32 stuff

Location:

main/branches/64_bit_Greenstone/greenstone3

Files:

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

main/branches/64_bit_Greenstone/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

@@ -330 +330 @@
     doc_meta_param_list.appendChild(doc_param);
     doc_param.setAttribute(GSXML.NAME_ATT, "metadata");
-    doc_param.setAttribute(GSXML.VALUE_ATT, "archivedir");
+    doc_param.setAttribute(GSXML.VALUE_ATT, "assocfilepath");
 
     // create the doc node list for the metadata request
@@ -356 +356 @@
     NodeList dm_response_docs = dm_response_doc_list.getChildNodes();
     for (int i = 0; i < doc_nodes.getLength(); i++) {
-        GSXML.mergeMetadataLists(doc_nodes.item(i), dm_response_docs.item(i));
-    }
-    // get teh top level doc metadata out
+      GSXML.mergeMetadataLists(doc_nodes.item(i), dm_response_docs.item(i));
+    }
+    // get the top level doc metadata out
     Element doc_meta_response = (Element)dm_response_message.getElementsByTagName(GSXML.RESPONSE_ELEM).item(1);
-    Element doc_meta_list = (Element)GSXML.getNodeByPath(doc_meta_response, "documentNodeList/documentNode/metadataList");
-    if (doc_meta_list != null) {
-        the_document.appendChild(this.doc.importNode(doc_meta_list, true));
-    }
+    Element top_doc_node = (Element)GSXML.getNodeByPath(doc_meta_response, "documentNodeList/documentNode");
+    GSXML.mergeMetadataLists(the_document, top_doc_node);
+    
     // Build a request to obtain some document content
     Element dc_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
@@ -470 +469 @@
         // hack for simple type
         if (document_type.equals("simple")) {
-        // we dont want the internal docNode, just want the content and metadata in the document
+            // we dont want the internal docNode, just want the content and metadata in the document
         // rethink this!!
         the_document.removeChild(dummy_node);
@@ -477 +476 @@
         //for (int i=0; i<dummy_children.getLength(); i++) {
         for (int i=dummy_children.getLength()-1; i>=0; i--) {
+          // special case as we don't want more than one metadata list
+          if (dummy_children.item(i).getNodeName().equals(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER)) {
+            GSXML.mergeMetadataFromList(the_document, dummy_children.item(i));
+          } else {
             the_document.appendChild(dummy_children.item(i));
-            
+          }
         }
         }