X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Felement.py;h=f388995caf8823c0110369e33acd139e163ccfed;hb=e7f67298d2bdac37e4a98138a3647ad9dde301f3;hp=401ca3130a5aca48f4c5910e85e9e532709c68c9;hpb=431a6bf78c6232a44b178e2092451e733a71bba3;p=sfa.git

diff --git a/sfa/rspecs/elements/element.py b/sfa/rspecs/elements/element.py
index 401ca313..f388995c 100644
--- a/sfa/rspecs/elements/element.py
+++ b/sfa/rspecs/elements/element.py
@@ -1,85 +1,55 @@
-from lxml import etree
-
-class Element:
-    def __init__(self, root_node, namespaces = None):
-        self.root_node = root_node
-        self.namespaces = namespaces
-
-    def xpath(self, xpath):
-        return this.root_node.xpath(xpath, namespaces=self.namespaces) 
-
-    def add_element(self, name, attrs={}, parent=None, text=""):
-        """
-        Wrapper around etree.SubElement(). Adds an element to
-        specified parent node. Adds element to root node is parent is
-        not specified.
-        """
-        if parent == None:
-            parent = self.root_node
-        element = etree.SubElement(parent, name)
-        if text:
-            element.text = text
-        if isinstance(attrs, dict):
-            for attr in attrs:
-                element.set(attr, attrs[attr])
-        return element
-
-    def remove_element(self, element_name, root_node = None):
-        """
-        Removes all occurences of an element from the tree. Start at
-        specified root_node if specified, otherwise start at tree's root.
-        """
-        if not root_node:
-            root_node = self.root_node
-
-        if not element_name.startswith('//'):
-            element_name = '//' + element_name
-
-        elements = root_node.xpath('%s ' % element_name, namespaces=self.namespaces)
-        for element in elements:
-            parent = element.getparent()
-            parent.remove(element)
-
-    
-    def add_attribute(self, elem, name, value):
-        """
-        Add attribute to specified etree element
-        """
-        opt = etree.SubElement(elem, name)
-        opt.text = value
-
-    def remove_attribute(self, elem, name, value):
-        """
-        Removes an attribute from an element
-        """
-        if not elem == None:
-            opts = elem.iterfind(name)
-            if opts is not None:
-                for opt in opts:
-                    if opt.text == value:
-                        elem.remove(opt)
-
-    def get_attributes(self, elem=None, depth=None):
-        if elem == None:
-            elem = self.root_node
-        attrs = dict(elem.attrib)
-        attrs['text'] = str(elem.text).strip()
-        if depth is None or isinstance(depth, int) and depth > 0: 
-            for child_elem in list(elem):
-                key = str(child_elem.tag)
-                if key not in attrs:
-                    attrs[key] = [self.get_attributes(child_elem, recursive)]
-                else:
-                    attrs[key].append(self.get_attributes(child_elem, recursive))
-        return attrs
-    
-    def attributes_list(self, elem):
-        # convert a list of attribute tags into list of tuples
-        # (tagnme, text_value)
-        opts = []
-        if not elem == None:
-            for e in elem:
-                opts.append((e.tag, e.text))
-        return opts
-
-    
+class Element(dict):
+
+    fields = {}
+
+    def __init__(self, fields={}, element=None, keys=None):
+        self.element = element
+        dict.__init__(self, self.fields)
+        if not keys:
+            keys = fields.keys()
+        for key in keys:
+            if key in fields:
+                self[key] = fields[keys] 
+
+    @staticmethod
+    def get(xml, xpath, element_class=Element, fields=None):
+        """
+        Search the specifed xml node for elements that match the 
+        specified xpath query. 
+        Returns a list of objectes instanced by the specfied element_class.
+        """
+        if not fields:
+           fields = element_class.fields.keys()
+        elems = xml.xpath(xpath, namespaces)
+        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)
+        generic_elems = [element_class(elem.attrib, elem) for elem in elems]
+        return objs
+
+
+    @staticmethod
+    def add(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]
+        if not fields:
+            fields = obj.keys()
+        elems = []
+        for obj in objs:
+            elem = xml.add_element(name)
+            for field in fields
+                if field in obj and obj[field]:
+                    elem.set(field, obj[field])
+            elems.append(elem)
+        return elems