Changeset 23628 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3
- Timestamp:
- 2011-01-24T13:18:00+13:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java
r20292 r23628 330 330 doc_meta_param_list.appendChild(doc_param); 331 331 doc_param.setAttribute(GSXML.NAME_ATT, "metadata"); 332 doc_param.setAttribute(GSXML.VALUE_ATT, "a rchivedir");332 doc_param.setAttribute(GSXML.VALUE_ATT, "assocfilepath"); 333 333 334 334 // create the doc node list for the metadata request … … 356 356 NodeList dm_response_docs = dm_response_doc_list.getChildNodes(); 357 357 for (int i = 0; i < doc_nodes.getLength(); i++) { 358 359 } 360 // get t ehtop level doc metadata out358 GSXML.mergeMetadataLists(doc_nodes.item(i), dm_response_docs.item(i)); 359 } 360 // get the top level doc metadata out 361 361 Element doc_meta_response = (Element)dm_response_message.getElementsByTagName(GSXML.RESPONSE_ELEM).item(1); 362 Element doc_meta_list = (Element)GSXML.getNodeByPath(doc_meta_response, "documentNodeList/documentNode/metadataList"); 363 if (doc_meta_list != null) { 364 the_document.appendChild(this.doc.importNode(doc_meta_list, true)); 365 } 362 Element top_doc_node = (Element)GSXML.getNodeByPath(doc_meta_response, "documentNodeList/documentNode"); 363 GSXML.mergeMetadataLists(the_document, top_doc_node); 364 366 365 // Build a request to obtain some document content 367 366 Element dc_message = this.doc.createElement(GSXML.MESSAGE_ELEM); … … 470 469 // hack for simple type 471 470 if (document_type.equals("simple")) { 472 471 // we dont want the internal docNode, just want the content and metadata in the document 473 472 // rethink this!! 474 473 the_document.removeChild(dummy_node); … … 477 476 //for (int i=0; i<dummy_children.getLength(); i++) { 478 477 for (int i=dummy_children.getLength()-1; i>=0; i--) { 478 // special case as we don't want more than one metadata list 479 if (dummy_children.item(i).getNodeName().equals(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER)) { 480 GSXML.mergeMetadataFromList(the_document, dummy_children.item(i)); 481 } else { 479 482 the_document.appendChild(dummy_children.item(i)); 480 483 } 481 484 } 482 485 }
Note:
See TracChangeset
for help on using the changeset viewer.