Changeset 28965 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/AbstractBasicDocument.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/AbstractBasicDocument.java (modified) (3 diffs)

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

@@ -34 +34 @@
 
     /** XML element for describe requests - the container doc */
-    protected Document doc = null; // typically a shared reference to the one in ServiceRack
+    //protected Document doc = null; // typically a shared reference to the one in ServiceRack
 
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.util.AbstractBasicDocument.class.getName());
 
-    public AbstractBasicDocument(Document doc) 
+    public AbstractBasicDocument() 
     {
-    this.doc = doc;
     }
 
@@ -47 +46 @@
      * <docNode nodeId='xxx' nodeType='leaf' docType='hierarchy'/>
      */
-  public Element createDocNode(String node_id) {
-    return createDocNode(node_id, null);
+  public Element createDocNode(Document doc, String node_id) {
+    return createDocNode(doc, node_id, null);
   }
     /** create an element to go into a results list. A node element
@@ -54 +53 @@
      * <docNode nodeId='xxx' nodeType='leaf' docType='hierarchy' [rank='0.23']/>
      */
-    public Element createDocNode(String node_id, String rank) {
-    Element node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+  public Element createDocNode(Document doc, String node_id, String rank) {
+    Element node = doc.createElement(GSXML.DOC_NODE_ELEM);
     node.setAttribute(GSXML.NODE_ID_ATT, node_id);
     if (rank != null) {