Changeset 28965 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/BasicDocumentDatabase.java

Timestamp:

2014-04-10T14:38:22+12:00 (10 years ago)

Author:

kjdon

Message:

removing stored Document field - now get passed it as needed or work it out from Element owner documents

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/BasicDocumentDatabase.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/BasicDocumentDatabase.java

@@ -52 +52 @@
 
     /** constructor */
-    public BasicDocumentDatabase(Document doc, 
-                  String database_type, String site_home,
+    public BasicDocumentDatabase(String database_type, String site_home,
                   String cluster_name,  String index_stem)
     {
-    super(doc);
+    super();
 
     coll_db = new SimpleCollectionDatabase(database_type);
@@ -130 +129 @@
         return GSXML.DOC_TYPE_PAGED;
     }
-        if (childtype.equals("PagedHierarchy"))
-          {
-            return GSXML.DOC_TYPE_PAGED_HIERARCHY;
-          }
+    if (childtype.equals("PagedHierarchy")) {
+      
+      return GSXML.DOC_TYPE_PAGED_HIERARCHY;
+    }
     return GSXML.DOC_TYPE_HIERARCHY;
 
@@ -308 +307 @@
         {
             String child_id = child_ids.get(i);
-            Element child_elem = createDocNode(child_id);
+            Element child_elem = createDocNode(doc.getOwnerDocument(), child_id);
             doc.appendChild(child_elem);
             if (recursive && (!child_elem.getAttribute(GSXML.NODE_TYPE_ATT).equals(GSXML.NODE_TYPE_LEAF) || child_elem.getAttribute(GSXML.DOC_TYPE_ATT).equals(GSXML.DOC_TYPE_PAGED)))