[Debconf-video-commits] r711 - in package/trunk: debian src

[Ben Hutchings]

Author: benh
Date: 2011-07-27 00:53:50 +0000 (Wed, 27 Jul 2011)
New Revision: 711

Modified:
   package/trunk/debian/changelog
   package/trunk/src/dc-publish
Log:
Update dc-publish script for new database schema

Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog	2011-07-25 23:06:39 UTC (rev 710)
+++ package/trunk/debian/changelog	2011-07-27 00:53:50 UTC (rev 711)
@@ -5,6 +5,7 @@
   * Allow more stream encoding options to be added
   * Set stream to half frame rate (12.5 Hz) and slower (higher quality)
     encoding
+  * Update dc-publish script for new database schema
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 26 Jul 2011 00:57:53 +0200
 

Modified: package/trunk/src/dc-publish
===================================================================
--- package/trunk/src/dc-publish	2011-07-25 23:06:39 UTC (rev 710)
+++ package/trunk/src/dc-publish	2011-07-27 00:53:50 UTC (rev 711)
@@ -136,13 +136,13 @@
 
 
     cur.execute("""
-SELECT video_target_file.id, target_format_abbr, event_recording_base_name,
+SELECT video_target_file.id, target_format_abbr, event_base_name,
        filename_extension
 FROM
-(((video_target_file JOIN video_event_recording
-   ON video_target_file.event_recording_id = video_event_recording.id)
+(((video_target_file JOIN video_event
+   ON video_target_file.event_id = video_event.event_id)
   JOIN event
-  ON video_event_recording.event_id = event.event_id)
+  ON video_target_file.event_id = event.event_id)
  JOIN video_target_format
  ON video_target_file.target_format_id = video_target_format.id)
 WHERE event.conference_id = %(conference_id)s