added 'enabled' attribute. orgaized

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

diff --git a/sfa/rspecs/rspec_converter.py b/sfa/rspecs/rspec_converter.py
index 7a0890e..6f96d4f 100755 (executable)
--- a/sfa/rspecs/rspec_converter.py
+++ b/sfa/rspecs/rspec_converter.py
@@ -1,7 +1,9 @@
 #!/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.sfa_rspec import sfa_rspec_version
+from sfa.rspecs.pg_rspec import pg_rspec_ad_version, pg_rspec_request_version
 from sfa.rspecs.rspec_parser import parse_rspec
 
 
@@ -10,20 +12,20 @@ class RSpecConverter:
     @staticmethod
     def to_sfa_rspec(in_rspec):
         rspec = parse_rspec(in_rspec)
-        if rspec.format == 'sfa': 
+        if rspec.version['type'] == sfa_rspec_version['type']: 
           return in_rspec
-        elif rspec.format == 'pg':
+        elif rspec.version['type'] == pg_rspec_ad_version['type']:
             return PGRSpecConverter.to_sfa_rspec(in_rspec)
         else:
-             return in_rspec 
+            return in_rspec 
 
     @staticmethod 
     def to_pg_rspec(in_rspec):
         rspec = parse_rspec(in_rspec)
-        if rspec.format == 'pg':
+        if rspec.version['type'] == pg_rspec_ad_version['type']:
             return in_rspec
-        elif rspec.format == 'sfa':
-            return SFARSpecConverter.to_pg_rspec(in_rspec)
+        elif rspec.version['type'] == sfa_rspec_version['type']:
+            return SfaRSpecConverter.to_pg_rspec(in_rspec)
         else:
             return in_rspec