fix pg rspec version and types

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

diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index 2a331c1..7c10a66 100755 (executable)
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -23,6 +23,9 @@ class RSpec:
         else:
             self.create()
 
+    def __get_template(self):
+        return self.template
+
     def create(self):
         """
         Create root element
@@ -32,11 +35,9 @@ class RSpec:
         now = datetime.utcnow()
         generated_ts = now.strftime(date_format)
         expires_ts = (now + timedelta(hours=1)).strftime(date_format) 
-        self.parse_rspec(self.template, self.namespaces)
+        self.parse_rspec(self.__get_template, self.namespaces)
         self.xml.set('valid_until', expires_ts)
         self.xml.set('generated', generated_ts)
-        if self.type:
-            self.xml.set('type', self.type)
     
     def parse_rspec(self, rspec, namespaces={}):
         """