parse_dict() can now handle repeating fields

[sfa.git] / sfa / util / xml.py

diff --git a/sfa/util/xml.py b/sfa/util/xml.py
index ac6526c..91a1d95 100755 (executable)
--- a/sfa/util/xml.py
+++ b/sfa/util/xml.py
@@ -4,7 +4,7 @@ from StringIO import StringIO
 from datetime import datetime, timedelta
 from sfa.util.xrn import *
 from sfa.util.plxrn import hostname_to_urn
-from sfa.util.faults import SfaNotImplemented, InvalidRSpec, InvalidRSpecElement
+from sfa.util.faults import SfaNotImplemented, InvalidXML
 
 class XpathFilter:
     @staticmethod
@@ -52,7 +52,7 @@ class XML:
             try:
                 tree = etree.parse(StringIO(xml), parser)
             except Exception, e:
-                raise InvalidRSpec(str(e))
+                raise InvalidXML(str(e))
         self.root = tree.getroot()
         # set namespaces map
         self.namespaces = dict(self.root.nsmap)
@@ -73,6 +73,26 @@ class XML:
                 namespace, schema  = schema_parts[0], schema_parts[1]
                 break
 
+    def parse_dict(self, d, root_tag_name='xml', element = None):
+        if element is None: 
+            self.parse_xml('<%s/>' % root_tag_name)
+            element = self.root
+
+        if 'text' in d:
+            text = d.pop('text')
+            element.text = text
+
+        # handle repeating fields
+        for (key, value) in d.items():
+            if isinstance(value, list):
+                value = d.pop(key)
+                for val in value:
+                    if isinstance(val, dict):
+                        child_element = etree.SubElement(element, key)
+                        self.parse_dict(val, key, child_element) 
+        
+        element.attrib.update(d)
+
     def validate(self, schema):
         """
         Validate against rng schema
@@ -82,7 +102,7 @@ class XML:
         if not relaxng(self.root):
             error = relaxng.error_log.last_error
             message = "%s (line %s)" % (error.message, error.line)
-            raise InvalidRSpec(message)
+            raise InvalidXML(message)
         return True
 
     def xpath(self, xpath, namespaces=None):
@@ -181,6 +201,18 @@ class XML:
 
     def toxml(self):
         return etree.tostring(self.root, pretty_print=True)  
+    
+    def todict(self, elem=None):
+        if elem is None:
+            elem = self.root
+        d = {}
+        d.update(elem.attrib)
+        d['text'] = elem.text
+        for child in elem.iterchildren():
+            if child.tag not in d:
+                d[child.tag] = []
+            d[child.tag].append(self.todict(child))
+        return d            
         
     def save(self, filename):
         f = open(filename, 'w')