Changeset 26046 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java

Timestamp:

2012-07-31T15:22:22+12:00 (12 years ago)

Author:

kjdon

Message:

moved a heap of duplicated code out of service racks and into BasicDocument classes

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java (modified) (11 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java

@@ -23 +23 @@
 
 import org.apache.log4j.Logger;
+import org.greenstone.gsdl3.util.AbstractBasicDocument;
+import org.greenstone.gsdl3.util.BasicDocument;
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.GSXML;
@@ -61 +63 @@
     protected static final String INFO_SIB_POS = "siblingPosition";
 
+    protected AbstractBasicDocument gs_doc = null;
+
     protected Element config_info = null; // the xml from the config file
 
     protected MacroResolver macro_resolver = null;
 
+    /**
+     * the default document type - use if all documents are the same type
+     */
     protected String default_document_type = null;
 
@@ -175 +182 @@
             }
         }
+
+        // Base line for document (might be overriden by sub-classes)
+        gs_doc = new BasicDocument(this.doc, this.default_document_type);
 
         return true;
@@ -644 +654 @@
     protected Element createDocNode(String node_id)
     {
-        Element node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
-        node.setAttribute(GSXML.NODE_ID_ATT, node_id);
-
-        String doc_type = null;
-        if (default_document_type != null)
-        {
-            doc_type = default_document_type;
-        }
-        else
-        {
-            doc_type = getDocType(node_id);
-        }
-        node.setAttribute(GSXML.DOC_TYPE_ATT, doc_type);
-        String node_type = getNodeType(node_id, doc_type);
-        node.setAttribute(GSXML.NODE_TYPE_ATT, node_type);
-        return node;
+      return this.gs_doc.createDocNode(node_id);
     }
 
@@ -668 +663 @@
     protected String getNodeType(String node_id, String doc_type)
     {
-        if (doc_type.equals(GSXML.DOC_TYPE_SIMPLE))
-        {
-            return GSXML.NODE_TYPE_LEAF;
-        }
-
-        if (getParentId(node_id) == null)
-        {
-            return GSXML.NODE_TYPE_ROOT;
-        }
-        if (doc_type.equals(GSXML.DOC_TYPE_PAGED))
-        {
-            return GSXML.NODE_TYPE_LEAF;
-        }
-        if (getChildrenIds(node_id) == null)
-        {
-            return GSXML.NODE_TYPE_LEAF;
-        }
-        return GSXML.NODE_TYPE_INTERNAL;
-
+      return this.gs_doc.getNodeType(node_id, doc_type);
     }
 
@@ -734 +711 @@
         parent_node.removeChild(current_node);
 
-        // add in all the siblings,
+        // add in all the siblings,- might be classifier/document nodes
         addDescendants(parent_node, parent_id, false);
 
@@ -743 +720 @@
         Element new_current = GSXML.getNamedElement(parent_node, current_node.getNodeName(), GSXML.NODE_ID_ATT, current_id);
         return new_current;
+
     }
 
@@ -758 +736 @@
     protected ArrayList<String> getSiblingIds(String node_id)
     {
-        String parent_id = getParentId(node_id);
-        if (parent_id == null)
-        {
-            return null;
-        }
-        return getChildrenIds(parent_id);
-
+      return this.gs_doc.getSiblingIds(node_id);
     }
 
@@ -778 +750 @@
      * GSXML.DOC_TYPE_HIERARCHY
      */
-    abstract protected String getDocType(String node_id);
+  protected String getDocType(String node_id) {
+    return this.gs_doc.getDocType(node_id);
+  }
 
     /**
@@ -784 +758 @@
      * . may be the same as node_id
      */
-    abstract protected String getRootId(String node_id);
+  protected String getRootId(String node_id) {
+    return this.gs_doc.getRootId(node_id);
+  }
 
     /** returns a list of the child ids in order, null if no children */
-    abstract protected ArrayList<String> getChildrenIds(String node_id);
+  protected ArrayList<String> getChildrenIds(String node_id) {
+    return this.gs_doc.getChildrenIds(node_id);
+  }
 
     /** returns the node id of the parent node, null if no parent */
-    abstract protected String getParentId(String node_id);
+  protected String getParentId(String node_id) {
+    return this.gs_doc.getParentId(node_id);
+  }
 
     /**
@@ -815 +795 @@
     /**
      * returns the structural information asked for. info_type may be one of
-     * INFO_NUM_SIBS, INFO_NUM_CHILDREN, INFO_SIB_POS
-     */
-    abstract protected String getStructureInfo(String node_id, String info_type);
+     * INFO_NUM_SIBS, INFO_NUM_CHILDREN, INFO_SIB_POS, INFO_DOC_TYPE
+     */
+  protected String getStructureInfo(String node_id, String info_type) {
+    return this.gs_doc.getStructureInfo(node_id, info_type);
+  }
 
 }