From 78a2adc9eb10f710bf2f037fcbbe81f9e808da61 Mon Sep 17 00:00:00 2001
From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 20 May 2011 13:14:17 -0400
Subject: [PATCH] fix bug in pg rspec schema attribute

---
 sfa/managers/aggregate_manager_pl.py |  4 +---
 sfa/rspecs/pg_rspec.py               | 10 +++-------
 sfa/rspecs/rspec.py                  |  6 +-----
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py
index b39bc21d..c4ca4e3d 100644
--- a/sfa/managers/aggregate_manager_pl.py
+++ b/sfa/managers/aggregate_manager_pl.py
@@ -316,10 +316,8 @@ def ListResources(api, creds, options,call_id):
 
     #panos adding the info option to the caching key (can be improved)
     if options.get('info'):
-	version_string = version_string + "_"+options.get('info')
+	version_string = version_string + "_"+options.get('info', 'default')
 
-    print "[aggregate] version string = ",version_string
-    
     # look in cache first
     if caching and api.cache and not xrn:
         rspec = api.cache.get(version_string)
diff --git a/sfa/rspecs/pg_rspec.py b/sfa/rspecs/pg_rspec.py
index 41879fc6..9b8df0b3 100755
--- a/sfa/rspecs/pg_rspec.py
+++ b/sfa/rspecs/pg_rspec.py
@@ -38,8 +38,11 @@ class PGRSpec(RSpec):
         self.type = type
         if not type or type == 'advertisement':
             self.version = pg_rspec_ad_version
+            rspec_type = 'ad'
         else:
             self.version = pg_rspec_request_version  
+            rspec_type == 'request'
+        self.template = self.template % locals()
 
         if not namespaces:
             self.namespaces = {'rspecv2': self.version['namespace']}
@@ -51,13 +54,6 @@ class PGRSpec(RSpec):
         else: 
             self.create()
 
-    def __get_template(self):
-        if self.type == 'adversisement':
-            rspec_type = 'ad'
-        else:
-            rspec_type == 'request'
-        return self.tempate % locals() 
-
     def create(self):
         RSpec.create(self)
         if self.type:
diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index 0a7a96b7..9bb51680 100755
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -25,9 +25,6 @@ class RSpec:
         else:
             self.create()
 
-    def __get_template(self):
-        return self.template
-
     def create(self):
         """
         Create root element
@@ -37,7 +34,7 @@ class RSpec:
         now = datetime.utcnow()
         generated_ts = now.strftime(date_format)
         expires_ts = (now + timedelta(hours=1)).strftime(date_format) 
-        self.parse_rspec(self.__get_template(), self.namespaces)
+        self.parse_rspec(self.template, self.namespaces)
         self.xml.set('valid_until', expires_ts)
         self.xml.set('generated', generated_ts)
     
@@ -47,7 +44,6 @@ class RSpec:
         """
         parser = etree.XMLParser(remove_blank_text=True)
         try:
-            print rspec
             tree = etree.parse(rspec, parser)
         except IOError:
             # 'rspec' file doesnt exist. 'rspec' is proably an xml string
-- 
2.43.0