Changeset 3304

Timestamp:

02/27/08 12:52:56 (9 months ago)

Author:

kris

Message:

removed string(), and made value() scan element data-subordinates instead

Files:

• trunk/tango/text/xml/Document.d (modified) (8 diffs)

trunk/tango/text/xml/Document.d

@@ -12 +12 @@
-
-package import tango.text.xml.PullParser;
+
+version=discrete;
-
-/*******************************************************************************
@@ -485 +487 @@
-                /***************************************************************
-                
-raw 
+
-
-                ***************************************************************/
@@ -491 +493 @@
-                T[] value ()
-                {
+version(discrete)
+{
+                        if (type is XmlNodeType.Element)
+                            foreach (child; children)
+                                     if (child.type is XmlNodeType.Data)
+                                         return child.rawValue;
+}
-                        return rawValue;
-                }
@@ -503 +512 @@
-                {
-                        rawValue = val; 
-                }
-                
-                /***************************************************************
-                
-                        Return the 'string' of this node, which is raw 
-                        content for most nodes, and local name for elements
-
-                ***************************************************************/
-        
-                T[] string ()
-                {
-                        auto m = rawValue;
-                        if (type is XmlNodeType.Element)
-                            m = localName;
-                        return m;
-                }
-                
@@ -579 +573 @@
-                        auto node = create (XmlNodeType.Element, null);
-                        append (node.set (prefix, local));
+version(discrete)
+{
-                        if (value.length)
-
+
+
+
+
+
+
-                        return node;
-                }
@@ -747 +748 @@
-                /***************************************************************
-        
-Return a set containing all data nodes of the 
-
-value
+Sweep the data nodes looking for match
+
+Returns a matching node, or null.
-
-                ***************************************************************/
@@ -765 +766 @@
-                /***************************************************************
-        
-Return a set containing all data nodes of the 
-
-value
+Sweep the data nodes looking for match
+
+Returns true if found.
-
-                ***************************************************************/
@@ -778 +779 @@
-                /***************************************************************
-                
-text
-
-a matching node, or null
+data
+
+true if found
-
-                ***************************************************************/