Changeset 4410

Timestamp:

09/20/07 13:06:04 (1 year ago)

Author:

tschaub

Message:

Adding a concatChildValues method to the XML parser. This gets around a messy 4kb limit for text node lengths - over which browsers split values among multiple siblings (see #1006).

Files:

• trunk/openlayers/lib/OpenLayers/Format/GML.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Format/XML.js (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Format/GML.js

@@ -296 +296 @@
-            nodeList = this.getElementsByTagNameNS(node, this.gmlns, "posList");
-            if(nodeList.length > 0) {
-nodeList[0].firstChild.nodeValue
+this.concatChildValues(nodeList[0])
-                coordString = coordString.replace(this.regExes.trimSpace, "");
-                coords = coordString.split(this.regExes.splitSpace);
@@ -315 +315 @@
-                                                       "coordinates");
-                if(nodeList.length > 0) {
-nodeList[0].firstChild.nodeValue
+this.concatChildValues(nodeList[0])
-                    coordString = coordString.replace(this.regExes.trimSpace,
-                                                      "");

trunk/openlayers/lib/OpenLayers/Format/XML.js

@@ -257 +257 @@
-        return attributeValue;
-    },
+    
+    /**
+     * APIMethod: getChildValue
+     * Get the value of the first child node if it exists, or return an
+     *     optional default string.  Returns an empty string if no first child
+     *     exists and no default value is supplied.
+     *
+     * Parameters:
+     * node - {DOMElement} The element used to look for a first child value.
+     * def - {String} Optional string to return in the event that no
+     *     first child value exists.
+     *
+     * Returns:
+     * {String} The value of the first child of the given node.
+     */
+    getChildValue: function(node, def) {
+        var value;
+        try {
+            value = node.firstChild.nodeValue;
+        } catch(e) {
+            value = (def != undefined) ? def : "";
+        }
+        return value;
+    },
+
+    /**
+     * APIMethod: concatChildValues
+     * Concatenate the value of all child nodes if any exist, or return an
+     *     optional default string.  Returns an empty string if no children
+     *     exist and no default value is supplied.  Not optimized for large
+     *     numbers of child nodes.
+     *
+     * Parameters:
+     * node - {DOMElement} The element used to look for child values.
+     * def - {String} Optional string to return in the event that no
+     *     child exist.
+     *
+     * Returns:
+     * {String} The concatenated value of all child nodes of the given node.
+     */
+    concatChildValues: function(node, def) {
+        var value = "";
+        var child = node.firstChild;
+        var childValue;
+        while(child) {
+            childValue = child.nodeValue;
+            if(childValue) {
+                value += childValue;
+            }
+            child = child.nextSibling;
+        }
+        if(value == "" && def != undefined) {
+            value = def;
+        }
+        return value;
+    },
-
-    /**