renamed SFA_AM_API_VERSION to SFA_AGGREGATE_API_VERSION

diff --git a/config/default_config.xml b/config/default_config.xml
index 6d052fc..0edfd48 100644 (file)
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -33,7 +33,7 @@ Thierry Parmentelat
           <description>The human readable name for this interface.</description>
         </variable>
 
-        <variable id="am_api_version" type="string">
+        <variable id="aggregate_api_version" type="string">
           <name>Aggregate Manager API Version</name>
           <value>1</value>
           <description>The Aggregate API version</description>

diff --git a/sfa/server/sfaapi.py b/sfa/server/sfaapi.py
index b0e9330..845ccff 100644 (file)
--- a/sfa/server/sfaapi.py
+++ b/sfa/server/sfaapi.py
@@ -245,8 +245,8 @@ class SfaApi (XmlrpcApi):
         response  
         """
         if self.interface.lower() == 'aggregate': 
-            if hasattr(self.config, 'SFA_AM_API_VERSION') and \
-              self.config.SFA_AM_API_VERSION == "2":
+            if hasattr(self.config, 'SFA_AGGREGATE_API_VERSION') and \
+              self.config.SFA_AGGREGATE_API_VERSION == "2":
                 result = self.prepare_response_v2_am(result)
         return XmlrpcApi.prepare_response(self, result, method)