From 2ee6b144f31afec17415d90821e3d30adebae25a Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 25 May 2012 12:14:20 -0400 Subject: [PATCH 1/2] CC-3814 Calendar: Switch view between "day" and "week" will cause some Notice in apache's error.log -fixed --- install_minimal/upgrades/airtime-2.1.0/data/upgrade.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/install_minimal/upgrades/airtime-2.1.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.1.0/data/upgrade.sql index 10be08473..944fe27cd 100644 --- a/install_minimal/upgrades/airtime-2.1.0/data/upgrade.sql +++ b/install_minimal/upgrades/airtime-2.1.0/data/upgrade.sql @@ -106,6 +106,7 @@ ALTER TABLE cc_show_instances ALTER COLUMN time_filled TYPE interval /* TYPE change - table: cc_show_instances original: time without time zone new: interval */, ALTER COLUMN time_filled SET DEFAULT '00:00:00'::interval; +UPDATE cc_show_instances SET time_filled = '00:00:00' WHERE time_filled is NULL; UPDATE cc_show_instances SET created = now(); UPDATE cc_show_instances SET last_scheduled = now(); From 910f8e86274067646f5711a086d7100dcf697917 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 25 May 2012 16:19:39 -0400 Subject: [PATCH 2/2] ensure dirs end with "/" --- .../airtimefilemonitor/airtimemediamonitorbootstrap.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py index 368b02fef..54c0a6170 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py @@ -77,6 +77,10 @@ class AirtimeMediaMonitorBootstrap(): dir -- pathname of the directory """ def sync_database_to_filesystem(self, dir_id, dir): + + dir = os.path.normpath(dir)+"/" + + """ set to hold new and/or modified files. We use a set to make it ok if files are added twice. This is because some of the tests for new files return result sets that are not