diff options
Diffstat (limited to 'cgi-bin/activities.py')
| -rwxr-xr-x | cgi-bin/activities.py | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/cgi-bin/activities.py b/cgi-bin/activities.py index 464195a..b2f7b0e 100755 --- a/cgi-bin/activities.py +++ b/cgi-bin/activities.py @@ -71,7 +71,15 @@ def getInstalled(subject): milestones.remove('karma') return milestones -def getEntries(subject, course, milestone): +def extractEntries(txt,log): + lines = txt.split(';') + line = lines[0].replace('\n',' ') + pos = line.find('=') + line = line[pos+1:] + entries = eval(line) + return entries + +def getEntries(subject, course, milestone,log): pth = path('content') /subject if len(milestone) > 0: fpth = pth / course / milestone / 'activities.js' @@ -80,15 +88,7 @@ def getEntries(subject, course, milestone): fin = open(fpth,'r') txt = fin.read() fin.close() - entries = [] - lines = txt.split('\n') - for line in lines: - try: - entry = eval(line)[0] - entries.append(entry) - except: - continue - return entries + return extractEntries(txt,log) def setEntries(subject, course, milestone, entries): pth = path('content') /subject @@ -96,13 +96,10 @@ def setEntries(subject, course, milestone, entries): fpth = pth / course / milestone / 'activities.js' else: fpth = pth / course / 'milestones.js' - fin = open(fpth,'r') - txt = fin.read() - fin.close() txtout = 'var activities = [\n' for entry in entries: txtout = txtout + str(entry) + ',\n' - txtout = txtout + '];\nvar assetList = [];\nvar logos = [];\n' + txtout = txtout + '];\n' fout = open(fpth,'w') fout.write(txtout) fout.close() |