update how RSpecVersion is used

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

diff --git a/sfa/rspecs/rspec_converter.py b/sfa/rspecs/rspec_converter.py
index 7a0890e..dd7fe1f 100755 (executable)
--- a/sfa/rspecs/rspec_converter.py
+++ b/sfa/rspecs/rspec_converter.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 from sfa.rspecs.pg_rspec_converter import PGRSpecConverter
-from sfa.rspecs.sfa_rspec_converter import SFARSpecConverter
+from sfa.rspecs.sfa_rspec_converter import SfaRSpecConverter
 from sfa.rspecs.rspec_parser import parse_rspec
 
 
@@ -10,9 +10,9 @@ class RSpecConverter:
     @staticmethod
     def to_sfa_rspec(in_rspec):
         rspec = parse_rspec(in_rspec)
-        if rspec.format == 'sfa': 
+        if rspec.version['type'] == 'sfa': 
           return in_rspec
-        elif rspec.format == 'pg':
+        elif rspec.version['type'] == 'protogeni':
             return PGRSpecConverter.to_sfa_rspec(in_rspec)
         else:
              return in_rspec 
@@ -20,10 +20,10 @@ class RSpecConverter:
     @staticmethod 
     def to_pg_rspec(in_rspec):
         rspec = parse_rspec(in_rspec)
-        if rspec.format == 'pg':
+        if rspec.version['type'] == 'protogeni': 
             return in_rspec
-        elif rspec.format == 'sfa':
-            return SFARSpecConverter.to_pg_rspec(in_rspec)
+        elif rspec.version['type'] == 'sfa':
+            return SfaRSpecConverter.to_pg_rspec(in_rspec)
         else:
             return in_rspec