Merge branch 'master' of git.fsmpi.rwth-aachen.de:videoagwebsite/videoagwebsite

importer.py

@@ -69,7 +69,7 @@ def import_from(id):
 				baserow = baserow[0]
 				rowdata = {'dates': []}
 
-				# "kein raum vergeben" ist ein Sonderfall, ansonsten die campus id
+				# "kein raum vergeben" is a special case, else use campus id
 				if baserow.xpath("td[6]/text()")[0] == 'Kein Raum vergeben':
 					rowdata['place'] = ''
 				elif baserow.xpath("td[6]/a"):

server.py

@@ -468,7 +468,7 @@ def job_handler(*types, state='finished'):
 		for jobtype in types:
 			if jobtype not in job_handlers:
 				job_handlers[jobtype] = {}
-			if jobtype not in job_handlers[jobtype]:
+			if state not in job_handlers[jobtype]:
 				job_handlers[jobtype][state] = []
 			job_handlers[jobtype][state].append(func)
 			return func