comment out wrong fragment

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

diff --git a/sfa/rspecs/elements/element.py b/sfa/rspecs/elements/element.py
index 273303c..a841323 100644 (file)
--- a/sfa/rspecs/elements/element.py
+++ b/sfa/rspecs/elements/element.py
@@ -4,25 +4,26 @@ class Element(dict):
 
     def __init__(self, fields={}, element=None, keys=None):
         self.element = element
-        dict.__init__(self, self.fields)
+        dict.__init__(self, dict.fromkeys(self.fields))
         if not keys:
             keys = fields.keys()
         for key in keys:
             if key in fields:
-                self[key] = fields[keys] 
+                self[key] = fields[key] 
 
     @staticmethod
-    def get(xml, xpath, element_class=None, fields=None):
+    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 objectes instanced by the specfied element_class.
+        Returns a list of objects instanced by the specified element_class.
         """
         if not element_class:
             element_class = Element
-        if not fields:
-           fields = element_class.fields.keys()
-        elems = xml.xpath(xpath, namespaces)
+# xxx this obviously is wrong...
+#        if not fields and hasattr(element_class, fields):
+#           fields = element_class.fields
+        elems = xml.xpath(xpath)
         objs = []
         for elem in elems:
             if not fields:
@@ -38,20 +39,22 @@ class Element(dict):
 
 
     @staticmethod
-    def add(xml, name, objs, fields=None):
+    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]
-        if not fields:
-            fields = obj.keys()
         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, obj[field])
+                    elem.set(field, unicode(obj[field]))
             elems.append(elem)
         return elems