[Debconf-video-commits] r703 - package/trunk/src

[Ben Hutchings]

Author: benh
Date: 2011-07-23 16:21:36 +0000 (Sat, 23 Jul 2011)
New Revision: 703

Modified:
   package/trunk/src/dc-export-csv
Log:
Update dc-export-csv for new database schema

Modified: package/trunk/src/dc-export-csv
===================================================================
--- package/trunk/src/dc-export-csv	2011-07-23 14:38:33 UTC (rev 702)
+++ package/trunk/src/dc-export-csv	2011-07-23 16:21:36 UTC (rev 703)
@@ -44,13 +44,16 @@
 	if speaker_name:
             event_speakers.setdefault(event_id, []).append(speaker_name)
 
-    cur.execute('SELECT event.event_id, event_recording_base_name, title,'
-                ' subtitle, language, abstract, recording_time, event_type'
-                ' FROM video_event_recording, event, video_recording'
-                ' WHERE video_event_recording.event_id=event.event_id'
-                ' AND video_event_recording.recording_id=video_recording.id'
-                ' AND event.conference_id=%(conf_id)d',
-                {'conf_id': conf_id})
+    cur.execute(
+        'SELECT event.event_id,'
+        ' COALESCE(event_recording_base_name, video_event.event_base_name),'
+        ' title, subtitle, language, abstract, recording_time, event_type'
+        ' FROM video_event_recording, event, video_recording, video_event'
+        ' WHERE video_event_recording.event_id=event.event_id'
+        ' AND video_event_recording.recording_id=video_recording.id'
+        ' AND event.conference_id=%(conf_id)d'
+        ' AND video_event.event_id=event.event_id',
+        {'conf_id': conf_id})
     for (event_id, base_name, title, subtitle, language,
          abstract, recording_time, event_type) in cur.fetchall():
         speakers = '; '.join(event_speakers.get(event_id, []))