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

[edrz-guest at alioth.debian.org]

Author: edrz-guest
Date: 2008-08-07 02:23:42 +0000 (Thu, 07 Aug 2008)
New Revision: 201

Modified:
   package/trunk/debian/changelog
   package/trunk/src/dc-import-recordings
Log:
adjust dc-import-recordings to find room names in penta to match lower case
room names from recording paths. (needs to be tested)




Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog	2008-08-07 02:09:50 UTC (rev 200)
+++ package/trunk/debian/changelog	2008-08-07 02:23:42 UTC (rev 201)
@@ -1,7 +1,10 @@
 debconf-video (8.0~dc8+5) etch; urgency=low
 
   * Update /etc/default/debconf-video for daffy, lisa & barney.
-  * Lower case ROOM_NAME values to match stream mount points.
+  * Lower case ROOM_NAME values to match stream mount points.  This also
+    affects the path of files written, hence:
+  * adjust dc-import-recordings to find room names in penta to match lower
+    case room names from recording paths. (needs to be tested)
   * Remove dvswitchrc for barney. 
 
  -- Holger Levsen <holger at debian.org>  Wed, 06 Aug 2008 16:06:27 -0300

Modified: package/trunk/src/dc-import-recordings
===================================================================
--- package/trunk/src/dc-import-recordings	2008-08-07 02:09:50 UTC (rev 200)
+++ package/trunk/src/dc-import-recordings	2008-08-07 02:23:42 UTC (rev 201)
@@ -61,7 +61,8 @@
                 'INSERT INTO video_recording(conference_id, conference_room,'
                 ' recording_time, recording_duration, recording_filename,'
                 ' file_status_id)'
-                ' VALUES (%(conf_id)d, %(room)s,'
+                ' VALUES (%(conf_id)d, '
+                ' (SELECT conference_room FROM conference_room WHERE conference_id=%(conf_id)d AND lower(replace(conference_room, ' ', '_'))=%(room)s),'
                 ' %(date_time)s, %(duration)s, %(filename)s,'
                 ' (SELECT id FROM video_file_status WHERE file_status_code=%(status)s))',
                 {'conf_id': conf_id,