cleanup

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

diff --git a/sfa/rspecs/rspec_version.py b/sfa/rspecs/rspec_version.py
index 4deb924..5caa544 100644 (file)
--- a/sfa/rspecs/rspec_version.py
+++ b/sfa/rspecs/rspec_version.py
@@ -1,32 +1,31 @@
 #!/usr/bin/python
-from sfa.util.sfalogging import sfa_logger
+from sfa.util.sfalogging import _SfaLogger
+
 
 class RSpecVersion:
 
-    format = None
-    version = None
+    format = 'sfa'
+    version = '1'
     schema = None
     namespace = None
     extensions = []
 
-    def __init__(self, version_raw):
-        self.logger = sfa_logger() 
-        self.parse_version(version_raw)
+    def __init__(self, version_string):
+        self.logger = _SfaLogger('/var/log/sfa.log') 
+        self.parse_version_string(version_string)
 
-    def parse_version(self, version_raw):
+    def parse_version_string(self, version_string):
         # version_raw is currently a string but will 
         # eventually be a struct.
-        try:
-            format_split = version_raw.split(' ')
-            format, version = format_split[0].lower(), format_split[1]
-        except:
-            self.logger.info("RSpecVersion: invalid rspec version: %s , using default" \
-                        % version_raw)
-            # invalid format. Just continue
-            format, version = 'sfa', '1'
-
-        self.format = format
-        self.version = version 
+        format_split = version_string.split(' ')
+        try: self.format = format_split[0].lower()  
+        except: pass
+        try: self.version = format_split[1]
+        except: pass
     
 
-                      
+    def parse_version_struct(self, version_struct):
+        try:
+            pass
+        except:
+            pass