From 4608f0414046d33a0c1d23fede908180a2bdec7f Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 23 May 2012 00:43:05 -0400 Subject: [PATCH 1/3] remove useless logging --- airtime_mvc/application/models/Schedule.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index a1df73747..931eeab2b 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -45,8 +45,6 @@ class Application_Model_Schedule { $nextShowID = count($shows['nextShow'])>0?$shows['nextShow'][0]['instance_id']:null; $results = Application_Model_Schedule::GetPrevCurrentNext($previousShowID, $currentShowID, $nextShowID, $utcTimeNow); - Logging::log($shows['currentShow']); - $range = array("env"=>APPLICATION_ENV, "schedulerTime"=>$timeNow, "previous"=>$results['previous'] !=null?$results['previous']:(count($shows['previousShow'])>0?$shows['previousShow'][0]:null), From 7299704ed0defe0edfa9e735e49098fe8f6c9bbd Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 23 May 2012 12:38:37 -0400 Subject: [PATCH 2/3] remove airtime-liquidsoap symbolic link on uninstall --- python_apps/pypo/install/pypo-uninitialize.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python_apps/pypo/install/pypo-uninitialize.py b/python_apps/pypo/install/pypo-uninitialize.py index 19d27768d..16b6ceab9 100644 --- a/python_apps/pypo/install/pypo-uninitialize.py +++ b/python_apps/pypo/install/pypo-uninitialize.py @@ -9,6 +9,7 @@ if os.geteuid() != 0: try: #stop pypo and liquidsoap processes print "Waiting for pypo processes to stop...", + subprocess.call("rm -f /usr/bin/airtime-liquidsoap") if (os.path.exists('/etc/init.d/airtime-playout')): subprocess.call("invoke-rc.d airtime-playout stop", shell=True) print "OK" From 28a383e960dfe67860d65f5136413be1aa537da5 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 23 May 2012 16:18:59 -0400 Subject: [PATCH 3/3] - fixed check for currentShow's end boundary to only be greater than current time --- airtime_mvc/application/models/Show.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index cb91a454e..cfd218b6f 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1771,7 +1771,7 @@ class Application_Model_Show { for( $i = 0; $i < $numberOfRows; ++$i ){ //Find the show that is within the current time. - if ((strtotime($rows[$i]['starts']) <= $timeNowAsMillis) && (strtotime($rows[$i]['ends']) >= $timeNowAsMillis)){ + if ((strtotime($rows[$i]['starts']) <= $timeNowAsMillis) && (strtotime($rows[$i]['ends']) > $timeNowAsMillis)){ if ( $i - 1 >= 0){ $results['previousShow'][0] = array( "id"=>$rows[$i-1]['id'],