more casting for SFAv1 rspecs

[sfa.git] / sfa / rspecs / rspec.py

diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index 00e048b..a17b7d6 100755 (executable)
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -2,7 +2,7 @@
 from datetime import datetime, timedelta
 
 from sfa.util.xml import XML, XpathFilter
-from sfa.util.faults import InvalidRSpecElement
+from sfa.util.faults import InvalidRSpecElement, InvalidRSpec
 
 from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements 
 from sfa.rspecs.version_manager import VersionManager
@@ -18,9 +18,15 @@ class RSpec:
         self.user_options = user_options
         self.elements = {}
         if rspec:
-            self.parse_xml(rspec)
-        else:
+            if version:
+                self.version = self.version_manager.get_version(version)
+                self.parse_xml(rspec, version)
+            else:
+                self.parse_xml(rspec)
+        elif version:
             self.create(version)
+        else:
+            raise InvalidRSpec("No RSpec or version specified. Must specify a valid rspec string or a valid version") 
 
     def create(self, version=None):
         """
@@ -28,7 +34,7 @@ class RSpec:
         """
         self.version = self.version_manager.get_version(version)
         self.namespaces = self.version.namespaces
-        self.parse_xml(self.version.template) 
+        self.parse_xml(self.version.template, self.version) 
         # eg. 2011-03-23T19:53:28Z 
         date_format = '%Y-%m-%dT%H:%M:%SZ'
         now = datetime.utcnow()
@@ -37,17 +43,16 @@ class RSpec:
         self.xml.set('expires', expires_ts)
         self.xml.set('generated', generated_ts)
 
-
-    def parse_xml(self, xml):
+    def parse_xml(self, xml, version=None):
         self.xml.parse_xml(xml)
-        self.version = None
-        if self.xml.schema:
-            self.version = self.version_manager.get_version_by_schema(self.xml.schema)
-        else:
-            #raise InvalidRSpec('unknown rspec schema: %s' % schema)
-            # TODO: Should start raising an exception once SFA defines a schema.
-            # for now we just use the default  
-            self.version = self.version_manager.get_version()
+        if not version:
+            if self.xml.schema:
+                self.version = self.version_manager.get_version_by_schema(self.xml.schema)
+            else:
+                #raise InvalidRSpec('unknown rspec schema: %s' % schema)
+                # TODO: Should start raising an exception once SFA defines a schema.
+                # for now we just  default to sfa 
+                self.version = self.version_manager.get_version({'type':'sfa','version': '1'})
         self.version.xml = self.xml    
         self.namespaces = self.xml.namespaces
     
@@ -70,7 +75,7 @@ class RSpec:
 
     def get(self, element_type, filter={}, depth=0):
         elements = self.get_elements(element_type, filter)
-        elements = [self.get_element_attributes(element, depth=depth) for element in elements]
+        elements = [self.xml.get_element_attributes(elem, depth=depth) for elem in elements]
         return elements
 
     def get_elements(self, element_type, filter={}):
@@ -83,19 +88,19 @@ class RSpec:
             raise InvalidRSpecElement(element_type, extra=msg)
         rspec_element = self.get_rspec_element(element_type)
         xpath = rspec_element.path + XpathFilter.xpath(filter)
-        return self.xpath(xpath)
+        return self.xml.xpath(xpath)
 
     def merge(self, in_rspec):
         self.version.merge(in_rspec)
 
     def filter(self, filter):
         if 'component_manager_id' in filter:    
-            nodes = self.version.get_node_elements()
+            nodes = self.version.get_nodes()
             for node in nodes:
                 if 'component_manager_id' not in node.attrib or \
                   node.attrib['component_manager_id'] != filter['component_manager_id']:
                     parent = node.getparent()
-                    parent.remove(node) 
+                    parent.remove(node.element) 
         
 
     def toxml(self, header=True):