diff --git a/importer.py b/importer.py index 90a5a6e7e22e143c9fd4faac0f1323943315cd48..bb9569032be4aff886b0fb481c9ce92b26d60e9f 100644 --- a/importer.py +++ b/importer.py @@ -101,7 +101,7 @@ def fetch_co_course_events(i): j['place'] = str(j['place']) if j['place'] != '': # info: sql no test cover - dbplace = query("SELECT name FROM places WHERE (campus_room = ?) OR (campus_name = ?) OR ((NOT campus_name) AND name = ?)", + dbplace = query("SELECT name FROM places WHERE (campus_room = ?) OR (campus_name = ?) OR (campus_name = '' AND name = ?)", j['place'], j['place'], j['place']) if dbplace: e['place'] = dbplace[0]['name'] diff --git a/sorter.py b/sorter.py index b78017e0372f92ae939d73e6287f1d73932e3f8a..94a097e35264e1f89f6543c4d6304a61be1c43ab 100644 --- a/sorter.py +++ b/sorter.py @@ -69,7 +69,7 @@ def insert_video(lectureid, dbfilepath, fileformatid, hash="", filesize=-1, dura query('INSERT INTO sortlog (lecture_id,video_id,path,"when") VALUES (?,?,?,?)', lectureid, video_id, dbfilepath, datetime.now()) schedule_job('probe', {'path': dbfilepath, 'lecture_id': lectureid, 'video_id': video_id, 'import-chapters': True}) schedule_thumbnail(lectureid) - video = query('SELECT videos.*, "format" AS sep, formats.* FROM videos JOIN formats ON formats.id = videos.video_format WHERE videos.id = ?', video_id)[0] + video = query('SELECT videos.*, \'format\' AS sep, formats.* FROM videos JOIN formats ON formats.id = videos.video_format WHERE videos.id = ?', video_id)[0] lecture = query('SELECT * FROM lectures WHERE id = ?', lectureid)[0] course = query('SELECT * FROM courses WHERE id = ?', lecture['course_id'])[0] notify_mods('new_video', course['id'], course=course, lecture=lecture, video=video)