Changeset 15669 for other-projects

Timestamp:

2008-05-23T12:35:40+12:00 (16 years ago)

Author:

ak19

Message:

Corrected logic error in setting NodeData.hasChildren member in constructor

File:

• other-projects/trunk/gs3-webservices-democlient/src/GS3DemoClient/org/greenstone/gs3client/data/NodeData.java (modified) (1 diff)

other-projects/trunk/gs3-webservices-democlient/src/GS3DemoClient/org/greenstone/gs3client/data/NodeData.java

@@ -65 +65 @@
      * or <documentNode nodeID = "x" /> */
     public NodeData(Element nodeTag) {
-        this.nodeTag = nodeTag; // store this node's tag information. Useful
-                    // for when we are setting the children of this NodeData
-        this.hasChildren = this.nodeTag.hasChildNodes();
-        
-        // We'd definitely have the nodeID attribute, but to be on the safe 
-        // side, check it's there first:
-        this.nodeID = nodeTag.hasAttribute(GSXML.NODE_ID_ATT) ?
-            nodeTag.getAttribute(GSXML.NODE_ID_ATT) : "";
+        this.nodeTag = nodeTag; // store this node's tag information. Useful
+                     // for when we are setting the children of this NodeData
+
+        // We'd definitely have the nodeID attribute, but to be on the safe 
+        // side, check it's there first:
+        this.nodeID = nodeTag.hasAttribute(GSXML.NODE_ID_ATT) ?
+        nodeTag.getAttribute(GSXML.NODE_ID_ATT) : "";
+        
+        // To determine whether this DocumentNodeData has children, we need 
+        // to know whether the DocumentNodeElement it represents has child 
+        // DocNodeElements. This kind of information is embedded inside a 
+        // nodeStructure element which will often contain a repeat of the  
+        // nodeTag-documentNodeElement itself. Therefore, we get the nodeTag's 
+        // first descendent element that is a documentNodeElement and check 
+        // whether it too has the same nodeID. If so, then we check whether  
+        // that documentNodeElement has child nodes - which in that case will 
+        // all be documentNodeElements. 
+        Element innerDocNode = ParseUtil.getFirstDescElementCalled(
+                       nodeTag, GSXML.DOC_NODE_ELEM);
+        if(innerDocNode == null
+           || !innerDocNode.getAttribute(GSXML.NODE_ID_ATT).equals(this.nodeID)) 
+        {
+            innerDocNode = this.nodeTag;
+        }
+        this.hasChildren = innerDocNode.hasChildNodes();
     }