X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Frspec_converter.py;h=7dff2f0b7863b3235f10fd051b4de3f9249984b1;hb=e3dfbbc08aee7acaf3aedaeb9771cccd677cd647;hp=4ea74c285a1c4ada0dce650d0b054974b2580621;hpb=71e66278d7bc26b09704c35150402bb62136101f;p=sfa.git

diff --git a/sfa/rspecs/rspec_converter.py b/sfa/rspecs/rspec_converter.py
index 4ea74c28..7dff2f0b 100755
--- a/sfa/rspecs/rspec_converter.py
+++ b/sfa/rspecs/rspec_converter.py
@@ -8,7 +8,7 @@ from sfa.rspecs.version_manager import VersionManager
 class RSpecConverter:
 
     @staticmethod
-    def to_sfa_rspec(in_rspec):
+    def to_sfa_rspec(in_rspec, content_type=None):
         rspec = RSpec(in_rspec)
         version_manager = VersionManager()
         sfa_version = version_manager._get_version('sfa', '1')
@@ -16,13 +16,12 @@ class RSpecConverter:
         if rspec.version.type.lower() == sfa_version.type.lower(): 
           return in_rspec
         elif rspec.version.type.lower() == pg_version.type.lower(): 
-            return PGRSpecConverter.to_sfa_rspec(in_rspec)
+            return PGRSpecConverter.to_sfa_rspec(in_rspec, content_type)
         else:
             return in_rspec 
 
     @staticmethod 
-    def to_pg_rspec(in_rspec):
-        rspec = parse_rspec(in_rspec)
+    def to_pg_rspec(in_rspec, content_type=None):
         rspec = RSpec(in_rspec)
         version_manager = VersionManager()
         sfa_version = version_manager._get_version('sfa', '1')
@@ -31,7 +30,7 @@ class RSpecConverter:
         if rspec.version.type.lower() == pg_version.type.lower(): 
             return in_rspec
         elif rspec.version.type.lower() == sfa_version.type.lower(): 
-            return SfaRSpecConverter.to_pg_rspec(in_rspec)
+            return SfaRSpecConverter.to_pg_rspec(in_rspec, content_type)
         else:
             return in_rspec