Changeset 4719

Timestamp:

2003-06-18T12:47:30+12:00 (21 years ago)

Author:

kjdon

Message:

changed the doc node creation (for the docs in the result list) to add in doc type attribute, same as query results

File:

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

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

@@ -303 +303 @@
     /** parent is true if this node is definitely the  parent of something, 
      * child is true is it definitely is a child of something - just for efficiency purposes */
-    protected Element createDocNode(String doc_id, boolean parent, boolean child) {
+    protected Element createDocNode(String node_id, boolean parent, boolean child) {
     
     // create this here or pass it in?
-    DBInfo db_info = gdbm_src_.getInfo(doc_id);
+    DBInfo info = gdbm_src_.getInfo(node_id);
     Element node;
-    if (isClassifier(doc_id)) {
+    if (isClassifier(node_id)) {
         node = doc_.createElement(GSXML.CLASS_NODE_ELEM);
-        String childtype = db_info.getInfo("childtype");
+        String childtype = info.getInfo("childtype");
         String orientation="";
         if (childtype.equals("HList")) {
@@ -319 +319 @@
         node.setAttribute(GSXML.CLASS_NODE_ORIENTATION_ATT, orientation);
     } else {
+        
         node = doc_.createElement(GSXML.DOC_NODE_ELEM);
-        if (/*!child &&*/ OID.isTop(doc_id)) {
+
+        String top_id = OID.getTop(node_id);
+        boolean is_top = (top_id.equals(node_id) ? true : false);
+    
+        String children = info.getInfo("contains");
+        boolean is_leaf = (children.equals("") ? true : false);
+        
+        // set teh node type att
+        if (is_top) {
         node.setAttribute(GSXML.NODE_TYPE_ATT, GSXML.NODE_TYPE_ROOT);
-        } else if (!parent && isLeafNode(doc_id)) {
+        } else if (is_leaf) {
         node.setAttribute(GSXML.NODE_TYPE_ATT, GSXML.NODE_TYPE_LEAF);
         } else {
         node.setAttribute(GSXML.NODE_TYPE_ATT, GSXML.NODE_TYPE_INTERIOR);
         }
-    }
-    node.setAttribute(GSXML.NODE_ID_ATT, doc_id);
+
+        // set teh doc type att
+        if (is_top && is_leaf) { // a single section document
+        node.setAttribute(GSXML.DOC_TYPE_ATT, "simple");
+        
+        } else {
+        
+        if (!is_top) { // we need to look at the top info
+            info = gdbm_src_.getInfo(top_id);
+        }
+        
+        String childtype = info.getInfo("childtype");
+        if (childtype.equals("Paged")) {
+            node.setAttribute(GSXML.DOC_TYPE_ATT, "paged");
+        } else {
+            node.setAttribute(GSXML.DOC_TYPE_ATT, "hierarchy");
+        }
+        }
+        
+    }
+    node.setAttribute(GSXML.NODE_ID_ATT, node_id);
     return node;