From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 20 May 2011 14:15:37 +0000 (-0400)
Subject: fix pg rspec versions
X-Git-Tag: sfa-1.0-22~35
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=93e2a75d50df044843ac31ba99226913fcb087a3;p=sfa.git

fix pg rspec versions
---

diff --git a/sfa/rspecs/rspec_converter.py b/sfa/rspecs/rspec_converter.py
index 8a661089..89f03a47 100755
--- a/sfa/rspecs/rspec_converter.py
+++ b/sfa/rspecs/rspec_converter.py
@@ -3,7 +3,7 @@
 from sfa.rspecs.pg_rspec_converter import PGRSpecConverter
 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_version
+from sfa.rspecs.pg_rspec import pg_rspec_ad_version, pg_rspec_request_version
 from sfa.rspecs.rspec_parser import parse_rspec
 
 
@@ -14,7 +14,7 @@ class RSpecConverter:
         rspec = parse_rspec(in_rspec)
         if rspec.version['type'] == sfa_rspec_version['type']: 
           return in_rspec
-        elif rspec.version['type'] == pg_rspec_version['type']:
+        elif rspec.version['type'] == pg_rspec_ad_version['type']:
             return PGRSpecConverter.to_sfa_rspec(in_rspec)
         else:
              return in_rspec 
@@ -22,7 +22,7 @@ class RSpecConverter:
     @staticmethod 
     def to_pg_rspec(in_rspec):
         rspec = parse_rspec(in_rspec)
-        if rspec.version['type'] == pg_rspec_version['type']:
+        if rspec.version['type'] == pg_rspec_ad_version['type']:
             return in_rspec
         elif rspec.version['type'] == sfa_rspec_version['type']:
             return SfaRSpecConverter.to_pg_rspec(in_rspec)