X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Futil%2Frspec.py;h=2848331286941e0bd03008ee0ac74088f7401666;hb=2f75a9d7d629163a7c95aa287ce1ec3dd008734f;hp=c03017144210e696ac4a4804fa2eb665b2a06073;hpb=207ce5fc6f0a4ed75bd5aa8808ea9aaab3c50c79;p=sfa.git

diff --git a/sfa/util/rspec.py b/sfa/util/rspec.py
index c0301714..28483312 100644
--- a/sfa/util/rspec.py
+++ b/sfa/util/rspec.py
@@ -137,23 +137,22 @@ class RSpec:
             if nodeDom.hasChildNodes():
                 for child in nodeDom.childNodes:
                     childName = self._getName(child)
-                    # skip null children 
-                    if not childName:
-                        continue
-                    # initialize the possible array of children        
-                    if not node[elementName].has_key(childName):
-                        node[elementName][childName] = []
-                    # if child node has text child nodes
-                    # append the children to the array as strings
-                    if child.hasChildNodes() and isinstance(child.childNodes[0], minidom.Text):
-                        for nextchild in child.childNodes:
+                    
+                    # skip null children
+                    if not childName: continue
+
+                    # initialize the possible array of children
+                    if not node[elementName].has_key(childName): node[elementName][childName] = []
+
+                    if isinstance(child, minidom.Text):
+                        # add if data is not empty
+                        if child.data.strip():
                             node[elementName][childName].append(nextchild.data)
-                    # convert element child node to dict
-                    else:       
+                    else:
                         childdict = self.toDict(child)
                         for value in childdict.values():
                             node[elementName][childName].append(value)
-                    #node[childName].append(self.toDict(child))
+
         return node