X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Frspec.py;h=04c2e52e19a7d35a1945f0c0f3be9b42ab6d8a6d;hb=511f20a7cb11b97552c414be60c297fcbb5adbde;hp=94ef1ff0251eed3fb400536bf2e758d378e73dad;hpb=7bb2b49138fab96a34e5750afa3e3831349033ff;p=sfa.git

diff --git a/sfa/util/rspec.py b/sfa/util/rspec.py
index 94ef1ff0..04c2e52e 100644
--- a/sfa/util/rspec.py
+++ b/sfa/util/rspec.py
@@ -91,6 +91,9 @@ class Rspec:
 
         if (nodeDom.hasChildNodes()):
             childdict={}
+            for attribute in nodeDom.attributes.keys():
+                siblingdict = self.appendToDictOrCreate(siblingdict, attribute, nodeDom.getAttribute(attribute))
+
             for child in nodeDom.childNodes[:-1]:
                 if (child.nodeValue):
                     siblingdict = self.appendToDictOrCreate(siblingdict, curNodeName, child.nodeValue)
@@ -102,10 +105,9 @@ class Rspec:
                 siblingdict = self.appendToDictOrCreate(siblingdict, curNodeName, child.nodeValue)
             else:
                 siblingdict = self.toGenDict(child, siblingdict, childdict, curNodeName)
-
-            for attribute in nodeDom.attributes.keys():
-                siblingdict = self.appendToDictOrCreate(siblingdict, attribute, nodeDom.getAttribute(attribute))
-
+        else:
+            siblingdict[curNodeName]=[]
+            
         if (parentdict is not None):
             parentdict = self.appendToDictOrCreate(parentdict, parent, siblingdict)
             return parentdict