From f5710006574134966fbb5402c4c9db9d53da431b Mon Sep 17 00:00:00 2001 From: drigato Date: Tue, 26 Nov 2013 12:32:05 -0500 Subject: [PATCH 1/6] Fixed updating single show instance problem where it wasn't fetching the current instance --- airtime_mvc/application/services/ShowService.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/services/ShowService.php b/airtime_mvc/application/services/ShowService.php index c347f6e68..303236e9f 100644 --- a/airtime_mvc/application/services/ShowService.php +++ b/airtime_mvc/application/services/ShowService.php @@ -896,7 +896,13 @@ SQL; if ($utcStartDateTime->getTimestamp() < $populateUntil->getTimestamp()) { $ccShowInstance = new CcShowInstances(); if ($this->isUpdate) { - $ccShowInstance = $this->getInstance($utcStartDateTime); + //use original cc_show_day object to get the current cc_show_instance + $origStartDateTime = new DateTime( + $this->origCcShowDay->getDbFirstShow()." ".$this->origCcShowDay->getDbStartTime(), + new DateTimeZone($this->origCcShowDay->getDbTimezone()) + ); + $origStartDateTime->setTimezone(new DateTimeZone("UTC")); + $ccShowInstance = $this->getInstance($origStartDateTime); } $ccShowInstance->setDbShowId($this->ccShow->getDbId()); From ffb31aa9f75296c04e8d4c35477b3a0b11011ed7 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Thu, 28 Nov 2013 15:37:05 -0500 Subject: [PATCH 2/6] CC-5583: Force database to be UTF8 regardless of terminal locale --- install_minimal/include/AirtimeInstall.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php index caf538409..bb4c27268 100644 --- a/install_minimal/include/AirtimeInstall.php +++ b/install_minimal/include/AirtimeInstall.php @@ -224,7 +224,7 @@ class AirtimeInstall return true; } - $command = "su postgres -c \"createdb $database --encoding UTF8 --owner $username\""; + $command = "sudo -i -u postgres psql postgres -c \"CREATE DATABASE ".$database." WITH ENCODING 'UTF8' TEMPLATE template0 OWNER ".$username."\""; @exec($command, $output, $results); if ($results == 0) { From 5b2b306eb548f5522689cb1934ea502f2ac8ee19 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Thu, 28 Nov 2013 16:00:31 -0500 Subject: [PATCH 3/6] CREDITS update for 2.5.1 --- CREDITS | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/CREDITS b/CREDITS index d09b5198c..826799c99 100644 --- a/CREDITS +++ b/CREDITS @@ -2,11 +2,34 @@ CREDITS ======= +Version 2.5.1 + +Albert Santoni (albert.santoni@sourcefabric.org) + Role: Developer Team Lead + +Denise Rigato (denise.rigato@sourcefabric.org) + Role: Software Developer + +Naomi Aro (naomi.aro@sourcefabric.org) + Role: Software Developer + +Cliff Wang (cliff.wang@sourcefabric.org) + Role: QA + +Daniel James (daniel.james@sourcefabric.org) + Role: Documentor & QA + + +Community Contributors: + +John Chewter + + Version 2.5.0 ------------- Albert Santoni (albert.santoni@sourcefabric.org) - Rold: Developer Team Lead + Role: Developer Team Lead Denise Rigato (denise.rigato@sourcefabric.org) Role: Software Developer From bf5e995547426c425232d01b4bdee4cd9e7a771c Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Thu, 28 Nov 2013 16:04:56 -0500 Subject: [PATCH 4/6] CC-5584: Quick PHP version check (5.4+) * Thanks to John Chewter for connecting the dots on this one! --- install_minimal/include/airtime-install.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/install_minimal/include/airtime-install.php b/install_minimal/include/airtime-install.php index ec7829269..cdb60831e 100644 --- a/install_minimal/include/airtime-install.php +++ b/install_minimal/include/airtime-install.php @@ -12,6 +12,14 @@ require_once(__DIR__.'/airtime-constants.php'); // The only way we get here is if we are doing a new install or a reinstall. // ------------------------------------------------------------------------- +if (PHP_VERSION_ID < 50400) //PHP 5.4 +{ + echo("ERROR: Your PHP version is too old!\nAirtime requires PHP 5.4 or greater.\n"); + exit(1); +} + +die(0); + $iniExists = file_exists("/etc/airtime/airtime.conf"); if ($iniExists) { //reinstall, Will ask if we should rewrite config files. From 28c81fcebbd3c60ebf376fe8babe12e4aa74362e Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Thu, 28 Nov 2013 16:09:03 -0500 Subject: [PATCH 5/6] Nothing to see here, just a typo... --- install_minimal/include/airtime-install.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/install_minimal/include/airtime-install.php b/install_minimal/include/airtime-install.php index cdb60831e..fa12def31 100644 --- a/install_minimal/include/airtime-install.php +++ b/install_minimal/include/airtime-install.php @@ -18,8 +18,6 @@ if (PHP_VERSION_ID < 50400) //PHP 5.4 exit(1); } -die(0); - $iniExists = file_exists("/etc/airtime/airtime.conf"); if ($iniExists) { //reinstall, Will ask if we should rewrite config files. From eae93008b4816b5b9ac76c1172755a12a19717d2 Mon Sep 17 00:00:00 2001 From: drigato Date: Mon, 2 Dec 2013 16:40:15 -0500 Subject: [PATCH 6/6] CC-5589: SQL error when adding/moving a scheduled item Error was occuring when a moved item didn't exist in a linked show instance Error was also occuring when trying to insert item into a schedule localtion that does not exist in a linked instance. Fixed by skipping the move action if the file does not exist in a linked instance, cleaning up the position numbers after deleting schedule items, and by setting the insert time to the show start time in a linked instance is empty --- airtime_mvc/application/models/Scheduler.php | 43 ++++++++++++++----- .../models/airtime/CcShowInstances.php | 23 ++++++++++ 2 files changed, 55 insertions(+), 11 deletions(-) diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php index 8bb477bc5..9cb79927c 100644 --- a/airtime_mvc/application/models/Scheduler.php +++ b/airtime_mvc/application/models/Scheduler.php @@ -626,19 +626,32 @@ class Application_Model_Scheduler $pos = Application_Common_Database::prepareAndExecute( $maxPos_sql, array(), Application_Common_Database::COLUMN); - $linkedItem_sql = "SELECT ends FROM cc_schedule ". - "WHERE instance_id = {$instanceId} ". - "AND position = {$pos} ". - "AND playout_status != -1"; - $linkedItemEnds = Application_Common_Database::prepareAndExecute( - $linkedItem_sql, array(), Application_Common_Database::COLUMN); + //show instance has no scheduled tracks + if (empty($pos)) { + $pos = 0; + $nextStartDT = new DateTime($instance["starts"], new DateTimeZone("UTC")); + } else { + + $linkedItem_sql = "SELECT ends FROM cc_schedule ". + "WHERE instance_id = {$instanceId} ". + "AND position = {$pos} ". + "AND playout_status != -1"; + $linkedItemEnds = Application_Common_Database::prepareAndExecute( + $linkedItem_sql, array(), Application_Common_Database::COLUMN); + + $nextStartDT = $this->findNextStartTime( + new DateTime($linkedItemEnds, new DateTimeZone("UTC")), + $instanceId); + } + } else { + $nextStartDT = $this->findNextStartTime( + new DateTime($linkedItemEnds, new DateTimeZone("UTC")), + $instanceId); + + $pos++; } - $nextStartDT = $this->findNextStartTime( - new DateTime($linkedItemEnds, new DateTimeZone("UTC")), - $instanceId); - - $pos++; + //$pos++; } //selected empty row to add after else { @@ -722,6 +735,13 @@ class Application_Model_Scheduler $sched = Application_Common_Database::prepareAndExecute( $movedItem_sql, array(), Application_Common_Database::SINGLE); } + /* If we don't find a schedule item it means the linked + * shows have a different amount of items (dyanmic block) + * and we should skip the item move for this show instance + */ + if (!$sched) { + continue; + } $excludeIds[] = intval($sched["id"]); $file["cliplength"] = $sched["clip_length"]; @@ -1160,6 +1180,7 @@ class Application_Model_Scheduler foreach ($instances as $instance) { $instance->updateScheduleStatus($this->con); + $instance->correctSchedulePositions(); } //update the last scheduled timestamp. diff --git a/airtime_mvc/application/models/airtime/CcShowInstances.php b/airtime_mvc/application/models/airtime/CcShowInstances.php index 6fdaaf8a2..e7dace7b1 100644 --- a/airtime_mvc/application/models/airtime/CcShowInstances.php +++ b/airtime_mvc/application/models/airtime/CcShowInstances.php @@ -138,6 +138,29 @@ class CcShowInstances extends BaseCcShowInstances { $this->setDbLastScheduled(gmdate("Y-m-d H:i:s")); $this->save($con); } + + /** + * + * This function resets the cc_schedule table's position numbers so that + * tracks for each cc_show_instances start at position 1 + * + * The position numbers can become out of sync when the user deletes items + * from linekd shows filled with dyanmic smart blocks, where each instance + * has a different amount of scheduled items + */ + public function correctSchedulePositions() + { + $schedule = CcScheduleQuery::create() + ->filterByDbInstanceId($this->id) + ->orderByDbStarts() + ->find(); + + $pos = 0; + foreach ($schedule as $item) { + $item->setDbPosition($pos)->save(); + $pos++; + } + } /** * Computes the value of the aggregate column time_filled