- if (nodeDom.nodeValue):
- siblingdict = self.appendToDictOrCreate(siblingdict, parent, nodeDom.nodeValue)
- elif (nodeDom.hasChildNodes()):
- for child in nodeDom.childNodes:
- siblingdict = self.toGenDict(child, None, siblingdict,curNodeName)
-
+ if (nodeDom.hasChildNodes()):
+ childdict={}
+ for attribute in nodeDom.attributes.keys():
+ childdict = self.appendToDictOrCreate(childdict, attribute, nodeDom.getAttribute(attribute))
+ for child in nodeDom.childNodes[:-1]:
+ if (child.nodeValue):
+ siblingdict = self.appendToDictOrCreate(siblingdict, curNodeName, child.nodeValue)
+ else:
+ childdict = self.toGenDict(child, None, childdict, curNodeName)
+
+ child = nodeDom.childNodes[-1]
+ if (child.nodeValue):
+ siblingdict = self.appendToDictOrCreate(siblingdict, curNodeName, child.nodeValue)
+ if (childdict):
+ siblingdict = self.appendToDictOrCreate(siblingdict, curNodeName, childdict)
+ else:
+ siblingdict = self.toGenDict(child, siblingdict, childdict, curNodeName)
+ else:
+ childdict={}