Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
drigato 2013-12-02 16:40:15 -05:00
parent 81912f2934
commit eae93008b4
2 changed files with 55 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
airtime_mvc/application/models/Scheduler.php
View File

@ -626,19 +626,32 @@ class Application_Model_Scheduler
$pos = Application_Common_Database::prepareAndExecute( $pos = Application_Common_Database::prepareAndExecute(
$maxPos_sql, array(), Application_Common_Database::COLUMN); $maxPos_sql, array(), Application_Common_Database::COLUMN);
$linkedItem_sql = "SELECT ends FROM cc_schedule ". //show instance has no scheduled tracks
"WHERE instance_id = {$instanceId} ". if (empty($pos)) {
"AND position = {$pos} ". $pos = 0;
"AND playout_status != -1"; $nextStartDT = new DateTime($instance["starts"], new DateTimeZone("UTC"));
$linkedItemEnds = Application_Common_Database::prepareAndExecute( } else {
$linkedItem_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);
$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( //$pos++;
new DateTime($linkedItemEnds, new DateTimeZone("UTC")),
$instanceId);
$pos++;
} }
//selected empty row to add after //selected empty row to add after
else { else {
@ -722,6 +735,13 @@ class Application_Model_Scheduler
$sched = Application_Common_Database::prepareAndExecute( $sched = Application_Common_Database::prepareAndExecute(
$movedItem_sql, array(), Application_Common_Database::SINGLE); $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"]); $excludeIds[] = intval($sched["id"]);
$file["cliplength"] = $sched["clip_length"]; $file["cliplength"] = $sched["clip_length"];
@ -1160,6 +1180,7 @@ class Application_Model_Scheduler
foreach ($instances as $instance) { foreach ($instances as $instance) {
$instance->updateScheduleStatus($this->con); $instance->updateScheduleStatus($this->con);
$instance->correctSchedulePositions();
} }
//update the last scheduled timestamp. //update the last scheduled timestamp.

23
airtime_mvc/application/models/airtime/CcShowInstances.php
View File

@ -138,6 +138,29 @@ class CcShowInstances extends BaseCcShowInstances {
$this->setDbLastScheduled(gmdate("Y-m-d H:i:s")); $this->setDbLastScheduled(gmdate("Y-m-d H:i:s"));
$this->save($con); $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 * Computes the value of the aggregate column time_filled