Changeset 4030

Timestamp:

2003-03-28T13:28:11+12:00 (21 years ago)

Author:

kjdon

Message:

now gets assocfilepath from top level document for cover image

File:

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

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

@@ -184 +184 @@
     }
 
+    // we also want a metadata request to the top level document to get
+    // assocfilepath - this could be cached too
+    Element doc_meta_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_PROCESS, to, lang);
+    dm_message.appendChild(doc_meta_request);
+    Element doc_meta_param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    doc_meta_request.appendChild(doc_meta_param_list);
+    Element doc_param = doc_.createElement(GSXML.PARAM_ELEM);
+    doc_meta_param_list.appendChild(doc_param);
+    doc_param.setAttribute(GSXML.NAME_ATT, "metadata");
+    doc_param.setAttribute(GSXML.VALUE_ATT, "assocfilepath");
+
+    // create the doc node list for the metadata request
+    Element doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    doc_meta_request.appendChild(doc_list);
+
+    Element doc_node = doc_.createElement(GSXML.DOC_NODE_ELEM);
+    // teh node we want is the root document node
+    doc_node.setAttribute(GSXML.NODE_ID_ATT, document_name+".rt");
+    doc_list.appendChild(doc_node);
     // System.out.println("(DocumentAction) Metadata request:\n" + converter_.getString(dm_request));
     Element dm_response_message = (Element) mr_.process(dm_message);
@@ -196 +215 @@
         GSXML.mergeMetadataLists(doc_nodes.item(i), dm_response_docs.item(i));
     }
-
+    // get teh top level do 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");
+    the_document.appendChild(doc_.importNode(doc_meta_list, true));
 
     // Build a request to obtain some document content
@@ -227 +249 @@
         Element enrich_pl = getServiceParamList(cgi_paramList);
         enrich_request.appendChild(enrich_pl);
-        Element doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
-        enrich_request.appendChild(doc_list);
-        doc_list.appendChild(doc_.importNode(dc_response_doc, true));
+        Element e_doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+        enrich_request.appendChild(e_doc_list);
+        e_doc_list.appendChild(doc_.importNode(dc_response_doc, true));
         
         Element enrich_response = mr_.process(enrich_message);
@@ -235 +257 @@
         String [] links = {GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER, GSXML.DOC_NODE_ELEM, GSXML.NODE_CONTENT_ELEM};
         path = GSPath.createPath(links);
-        System.out.println("enrich path = "+path);
-
-        //appendLink(GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
-        //path = GSPath.appendLink(GSXML.DOC_NODE_ELEM
         dc_response_doc_content = (Element)GSXML.getNodeByPath(enrich_response, path);
         } 
@@ -248 +266 @@
     // Merge the document content with the metadata and structure information
     for (int i = 0; i < doc_nodes.getLength(); i++) {
-        Node doc_node = doc_nodes.item(i);
-        Node doc_node_id = doc_node.getAttributes().getNamedItem(GSXML.NODE_ID_ATT);
-        String dc_doc_id = doc_node_id.getNodeValue();
-        if (dc_doc_id.equals(modified_doc_id)) {
-        doc_node.appendChild(doc_.importNode(dc_response_doc_content, true));
+        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;
         }