Changeset 3819

Timestamp:

2003-03-10T10:51:06+13:00 (21 years ago)

Author:

mdewsnip

Message:

Generic base class of GS2MGRetrieve and GS2MGPPRetrieve. Implements shared functionality: processDocumentStructureRetrieve and processDocumentMetadataRetrieve.

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java (modified) (10 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java

@@ -26 +26 @@
 // XML classes
 import org.w3c.dom.Element; 
+import org.w3c.dom.NodeList;
 
 // General Java classes
@@ -47 +48 @@
     protected static final String DOCUMENT_CONTENT_RETRIEVE_SERVICE = "DocumentContentRetrieve";
 
-    protected static final String ROOT_NODE = "root";
-    protected static final String INTERIOR_NODE = "interior";
-    protected static final String LEAF_NODE = "leaf";
-
     protected GDBMWrapper gdbm_src_ = null;
 
@@ -57 +54 @@
     protected GS2Retrieve()
     {
-    System.out.println("Constructing GS2Retrieve...");
     gdbm_src_ = new GDBMWrapper();
     }
@@ -94 +90 @@
     String gdbm_db_file = GSFile.GDBMDatabaseFile(site_home_, cluster_name_);
     if (!gdbm_src_.openDatabase(gdbm_db_file, GDBMWrapper.READER)) {
-        System.err.println("Error: Could not open gdbm database!");
+        System.err.println("Error: Could not open GDBM database!");
         return false;
     }
@@ -120 +116 @@
     parent.setAttribute(GSXML.DOC_NODE_ID_ATT, parent_id);
     if (OID.isTop(parent_id))
-        parent.setAttribute(GSXML.DOC_NODE_TYPE_ATT, ROOT_NODE);
+        parent.setAttribute(GSXML.DOC_NODE_TYPE_ATT, GSXML.NODE_TYPE_ROOT);
     else
-        parent.setAttribute(GSXML.DOC_NODE_TYPE_ATT, INTERIOR_NODE);
+        parent.setAttribute(GSXML.DOC_NODE_TYPE_ATT, GSXML.NODE_TYPE_INTERIOR);
 
     return parent;
@@ -148 +144 @@
         // Record if the node is a leaf node or an internal node
         if (isLeafNode(child_id))
-        child.setAttribute(GSXML.DOC_NODE_TYPE_ATT, LEAF_NODE);
+        child.setAttribute(GSXML.DOC_NODE_TYPE_ATT, GSXML.NODE_TYPE_LEAF);
         else
-        child.setAttribute(GSXML.DOC_NODE_TYPE_ATT, INTERIOR_NODE);
+        child.setAttribute(GSXML.DOC_NODE_TYPE_ATT, GSXML.NODE_TYPE_INTERIOR);
     }
     }
@@ -201 +197 @@
         if (param.getAttribute(GSXML.NAME_ATT) == "structure") {
             String structure = GSXML.getValue(param);
-            System.out.println("Structure desired: " + structure);
+            // System.out.println("Structure desired: " + structure);
 
             // This is NOT locale sensitive
@@ -244 +240 @@
 
         // Add the document to the list
+        // !! TO DO: This should probably be a documentNode rather than a document !!
         Element doc = doc_.createElement(GSXML.DOCUMENT_ELEM);
         doc_list.appendChild(doc);
@@ -252 +249 @@
         current.setAttribute(GSXML.DOC_NODE_ID_ATT, doc_id);
         if (OID.isTop(doc_id))
-        current.setAttribute(GSXML.DOC_NODE_TYPE_ATT, ROOT_NODE);
+        current.setAttribute(GSXML.DOC_NODE_TYPE_ATT, GSXML.NODE_TYPE_ROOT);
         else if (isLeafNode(doc_id))
-        current.setAttribute(GSXML.DOC_NODE_TYPE_ATT, LEAF_NODE);
+        current.setAttribute(GSXML.DOC_NODE_TYPE_ATT, GSXML.NODE_TYPE_LEAF);
         else
-        current.setAttribute(GSXML.DOC_NODE_TYPE_ATT, INTERIOR_NODE);
+        current.setAttribute(GSXML.DOC_NODE_TYPE_ATT, GSXML.NODE_TYPE_INTERIOR);
 
         // Ancestors: continually add parent nodes until the root is reached
@@ -357 +354 @@
 
     // Get the documents
-    String[] doc_ids = GSXML.getDocumentNameList(content);
-    for (int i = 0; i < doc_ids.length; i++) {
-        String doc_id = doc_ids[i];
+    Element request_doc_list = (Element) GSXML.getChildByTagName(content, GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
+    NodeList request_docs = request_doc_list.getChildNodes();
+    for (int i = 0; i < request_docs.getLength(); i++) {
+        Element request_doc = (Element) request_docs.item(i);
+        String doc_id = request_doc.getAttribute(GSXML.DOC_NODE_ID_ATT);
         System.out.println("Retrieving metadata for " + doc_id + "...");
 
         // Add the document to the list
-        Element doc = doc_.createElement(GSXML.DOCUMENT_ELEM);
-        doc_list.appendChild(doc);
-        doc.setAttribute(GSXML.NAME_ATT, doc_id);
+        Element doc_node = doc_.createElement(GSXML.DOC_NODE_ELEM);
+        doc_list.appendChild(doc_node);
+        doc_node.setAttribute(GSXML.DOC_NODE_ID_ATT, doc_id);
+        doc_node.setAttribute(GSXML.DOC_NODE_TYPE_ATT,
+                  request_doc.getAttribute(GSXML.DOC_NODE_TYPE_ATT));
 
         // Add the requested metadata information
-        Element doc_meta_list = GSXML.addMetaList(doc_, doc);
+        Element doc_meta_list = GSXML.addMetaList(doc_, doc_node);
         DBInfo info = gdbm_src_.getInfo(doc_id);
         for (int m = 0; m < metadata_list.size(); m++) {