replaced Element.get_elements() with XmlNode.get_instance(). replaced Element.add_ele...

[sfa.git] / sfa / rspecs / elements / element.py

diff --git a/sfa/rspecs/elements/element.py b/sfa/rspecs/elements/element.py
index 5789a9c..a2febfc 100644 (file)
--- a/sfa/rspecs/elements/element.py
+++ b/sfa/rspecs/elements/element.py
@@ -11,47 +11,9 @@ class Element(dict):
             if key in fields:
                 self[key] = fields[key] 
 
-    @staticmethod
-    def get_elements(xml, xpath, element_class=None, fields=None):
-        """
-        Search the specifed xml node for elements that match the 
-        specified xpath query. 
-        Returns a list of objects instanced by the specified element_class.
-        """
-        if not element_class:
-            element_class = Element
-        if not fields and hasattr(element_class, 'fields'):
-           fields = element_class.fields
-        elems = xml.xpath(xpath)
-        objs = []
-        for elem in elems:
-            if not fields:
-                obj = element_class(elem.attrib, elem)
-            else:
-                obj = element_class({}, elem)
-                for field in fields:
-                    if field in elem.attrib:
-                        obj[field] = elem.attrib[field]    
-            objs.append(obj)
-        return objs
-
-    @staticmethod
-    def add_elements(xml, name, objs, fields=None):
-        """
-        Adds a child node to the specified xml node based on
-        the specified name , element class and object.    
-        """
-        if not isinstance(objs, list):
-            objs = [objs]
-        elems = []
-        for obj in objs:
-            if not obj:
-                continue
-            if not fields:
-                fields = obj.keys()
-            elem = xml.add_element(name)
-            for field in fields:
-                if field in obj and obj[field]:
-                    elem.set(field, unicode(obj[field]))
-            elems.append(elem)
-        return elems
+    def __getattr__(self, attr):
+        if hasattr(self, attr):
+            return getattr(self, attr)
+        elif self.element is not None and hasattr(self.element, attr):
+            return getattr(self.element, attr)
+        raise AttributeError, "Element class has no attribute %s" % attr