Changeset 8690 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java

Timestamp:

2004-11-29T11:50:38+13:00 (19 years ago)

Author:

kjdon

Message:

check the doctype in gdbm db first, before trying to work it out.

File:

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

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

@@ -394 +394 @@
         boolean is_leaf = (children.equals("") ? true : false);
         
-        // set teh node type att
+        // set the node type att
         if (is_top) {
         node.setAttribute(GSXML.NODE_TYPE_ATT, GSXML.NODE_TYPE_ROOT);
@@ -403 +403 @@
         }
 
-        // set teh doc type att
-        if (is_top && is_leaf) { // a single section document
-        node.setAttribute(GSXML.DOC_TYPE_ATT, "simple");
-        
+        // set the doc type att
+        String doc_type = info.getInfo("doctype");
+        if (!doc_type.equals("")&&!doc_type.equals("doc")) {
+        node.setAttribute(GSXML.DOC_TYPE_ATT, doc_type);
         } else {
-        
-        if (!is_top) { // we need to look at the top info
-            info = this.gdbm_src.getInfo(top_id);
-        }
-        
-        String childtype = info.getInfo("childtype");
-        if (childtype.equals("Paged")) {
-            node.setAttribute(GSXML.DOC_TYPE_ATT, "paged");
+        if (is_top && is_leaf) { // a single section document
+            node.setAttribute(GSXML.DOC_TYPE_ATT, "simple");
+        
         } else {
-            node.setAttribute(GSXML.DOC_TYPE_ATT, "hierarchy");
+            
+            if (!is_top) { // we need to look at the top info
+            info = this.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");
+            }
         }
         }