Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge performance fixes, and rename StudentModule.get_from_cache to get_with_caching

Browse Source
This commit is contained in:
David Ormsbee
2012-02-29 18:28:18 -05:00
parent 7f68610dac ab0b791010
commit d60d689611
3 changed files with 54 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
courseware/content_parser.py
View File

@@ -168,17 +168,23 @@ def course_xml_process(tree):
return tree
def course_file(user):
''' Given a user, return course.xml
'''
# TODO: Cache.
''' Given a user, return course.xml'''
filename = user.profile_cache.courseware # UserProfile.objects.get(user=user).courseware
groups = user_groups(user)
options = {'dev_content':settings.DEV_CONTENT,
'groups' : groups}
tree = course_xml_process(etree.XML(render_to_string(filename, options, namespace = 'course')))
cache_key = filename + "_processed?dev_content:" + str(options['dev_content']) + "&groups:" + str(sorted(groups))
tree_string = cache.get(cache_key)
if not tree_string:
tree = course_xml_process(etree.XML(render_to_string(filename, options, namespace = 'course')))
tree_string = etree.tostring(tree)
cache.set(cache_key, tree_string, 60)
else:
tree = etree.XML(tree_string)
return tree
def section_file(user, section):