"
print "\t"
print "
"
print ""
print ""
print ""
@@ -367,7 +366,6 @@ class WebView:
self.footer()
-
class TeleOddCast:
"""Manage the calls of Station and Webview to get the network and
disk streams"""
@@ -391,29 +389,29 @@ class TeleOddCast:
form = cgi.FieldStorage()
if self.odd_pid == [] and form.has_key("action") and \
- form.has_key("department") and form.has_key("course") and \
+ form.has_key("department") and form.has_key("conference") and \
form.has_key("professor") and form.has_key("comment") and \
form["action"].value == "start":
- self.course_dict = {'title': self.title,
+ self.conference_dict = {'title': self.title,
'department': form["department"].value,
- 'course': form["course"].value,
+ 'conference': form["conference"].value,
'session': form["session"].value,
'professor': form["professor"].value,
'comment': form["comment"].value}
- s = Station(self.conf_file, self.course_dict, self.lock_file)
+ s = Station(self.conf_file, self.conference_dict, self.lock_file)
s.start()
- w.stop_form(self.course_dict)
+ w.stop_form(self.conference_dict)
elif self.odd_pid != [] and os.path.exists(self.lock_file) and not form.has_key("action"):
- self.course_dict = get_course_from_lock(self.lock_file)
- w.stop_form(self.course_dict)
+ self.conference_dict = get_conference_from_lock(self.lock_file)
+ w.stop_form(self.conference_dict)
elif self.odd_pid != [] and form.has_key("action") and form["action"].value == "stop":
if os.path.exists(self.lock_file):
- self.course_dict = get_course_from_lock(self.lock_file)
- s = Station(self.conf_file, self.course_dict, self.lock_file)
+ self.conference_dict = get_conference_from_lock(self.lock_file)
+ s = Station(self.conf_file, self.conference_dict, self.lock_file)
s.stop()
w.start_form()
@@ -423,7 +421,7 @@ class TeleOddCast:
# Call main function.
conf_file = 'etc/teleoddcast.xml'
-school_file = 'etc/default_courses.xml'
+school_file = 'etc/default_conferences.xml'
if __name__ == '__main__':
t = TeleOddCast(conf_file, school_file)
diff --git a/tools.py b/tools.py
index 64ca216..4e28098 100644
--- a/tools.py
+++ b/tools.py
@@ -68,35 +68,35 @@ def get_params_from_lock(lock_file):
return params_ok
def dict2tuple(dict):
- len_dict = len(dict['course'])
+ len_dict = len(dict['conference'])
if len_dict == 1:
- return dict['course']['name']
+ return dict['conference']['name']
else:
tup = []
- for value in dict['course']:
+ for value in dict['conference']:
tup.append(value['name'])
return tup
def dict2tuple_iso(dict):
- len_dict = len(dict['course'])
+ len_dict = len(dict['conference'])
if len_dict == 1:
- return unicode(dict['course']['name'],'utf8').encode('iso-8859-1')
+ return unicode(dict['conference']['name'],'utf8').encode('iso-8859-1')
else:
tup = []
- for value in dict['course']:
+ for value in dict['conference']:
tup.append(unicode(value['name'],'utf8').encode('iso-8859-1'))
return tup
-def get_course_from_lock(lock_file):
+def get_conference_from_lock(lock_file):
lockfile = open(lock_file,'r')
- course = lockfile.readline()
- course_l = course.split('_*_')
- course_dict = {'title': course_l[0],
- 'department': course_l[1],
- 'course': course_l[2],
- 'session': course_l[3],
- 'professor': course_l[4],
- 'comment': course_l[5]}
+ conference = lockfile.readline()
+ conference_l = conference.split('_*_')
+ conference_dict = {'title': conference_l[0],
+ 'department': conference_l[1],
+ 'conference': conference_l[2],
+ 'session': conference_l[3],
+ 'professor': conference_l[4],
+ 'comment': conference_l[5]}
lockfile.close()
- return course_dict
+ return conference_dict
--
2.39.5