#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)
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']}
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:
else:
self.create()
- def __get_template(self):
- return self.template
-
def create(self):
"""
Create root element
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)
"""
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