Changeset 3817

Timestamp:

2003-03-10T10:46:04+13:00 (21 years ago)

Author:

mdewsnip

Message:

Modified to use documentNodes instead of documents.

File:

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

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

@@ -50 +50 @@
     String to;
     String document_name = (String) params.get(GSCGI.DOCUMENT_ARG);
-    System.out.println("Document name: " + document_name);
     if (document_name == null || document_name.equals("")) {
         System.err.println("DocumentAction Error: no document specified!");
@@ -88 +87 @@
 
     // Process the document structure retrieve message
-    System.out.println("(DocumentAction) Structure request:\n" + converter_.getString(ds_message));
+    // System.out.println("(DocumentAction) Structure request:\n" + converter_.getString(ds_message));
     Element ds_response = (Element) mr_.process(ds_message);
-    System.out.println("(DocumentAction) Structure response:\n" + converter_.getString(ds_response));
+    // System.out.println("(DocumentAction) Structure response:\n" + converter_.getString(ds_response));
 
     Element ds_response_content = (Element) GSXML.getNodeByPath(ds_response, "response/content");
@@ -127 +126 @@
     NodeList doc_nodes = ds_response_document.getElementsByTagName(GSXML.DOC_NODE_ELEM);
     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.DOC_NODE_ID_ATT);
-        String dm_doc_id = doc_node_id.getNodeValue();
-        dm_doc_list.appendChild(GSXML.createDocumentElement(doc_, dm_doc_id));
-    }
-
-    System.out.println("(DocumentAction) Metadata request:\n" + converter_.getString(dm_request));
+        Element doc_node = (Element) doc_nodes.item(i);
+        String doc_node_id = doc_node.getAttribute(GSXML.DOC_NODE_ID_ATT);
+
+        // Add the documentNode to the list
+        Element dm_doc_node = doc_.createElement(GSXML.DOC_NODE_ELEM);
+        dm_doc_list.appendChild(dm_doc_node);
+        dm_doc_node.setAttribute(GSXML.DOC_NODE_ID_ATT, doc_node_id);
+        dm_doc_node.setAttribute(GSXML.DOC_NODE_TYPE_ATT,
+                     doc_node.getAttribute(GSXML.DOC_NODE_TYPE_ATT));
+    }
+
+    // System.out.println("(DocumentAction) Metadata request:\n" + converter_.getString(dm_request));
     Element dm_response = (Element) mr_.process(dm_message);
-    System.out.println("(DocumentAction) Metadata response:\n" + converter_.getString(dm_response));
+    // System.out.println("(DocumentAction) Metadata response:\n" + converter_.getString(dm_response));
 
     Element dm_response_content = (Element) GSXML.getNodeByPath(dm_response, "response/content");
@@ -169 +173 @@
     dc_doc.setAttribute(GSXML.NAME_ATT, document_name);
 
-    System.out.println("(DocumentAction) Content request:\n" + converter_.getString(dc_request));
+    // System.out.println("(DocumentAction) Content request:\n" + converter_.getString(dc_request));
     Element dc_response = (Element) mr_.process(dc_message);
-    System.out.println("(DocumentAction) Content response:\n" + converter_.getString(dc_response));
+    // System.out.println("(DocumentAction) Content response:\n" + converter_.getString(dc_response));
 
     Element dc_response_doc_content = (Element) GSXML.getNodeByPath(dc_response, "response/content/documentList/document/content");
@@ -201 +205 @@
     response.appendChild(doc_.importNode(ds_response_content, true));
 
-    System.out.println("Finished page: " + converter_.getString(page));
+    // System.out.println("Finished page: " + converter_.getString(page));