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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Rudi Grinberg 2012-09-18 15:52:26 -04:00
commit 608fff090c
9 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/models/Schedule.php
View file

@ -696,6 +696,7 @@ SQL;
'start' => $start,
'end' => $end,
'show_name' => $item["show_name"],
'row_id' => $item["id"],
'independent_event' => true
);
self::appendScheduleItem($data, $start, $schedule_item);

2
airtime_mvc/application/models/Scheduler.php
View file

@ -331,7 +331,7 @@ class Application_Model_Scheduler
* This function squeezes all items of a show together so that
* there are no gaps between them.
*/
private function removeGaps($showInstance, $exclude=null)
public function removeGaps($showInstance, $exclude=null)
{
Logging::info("removing gaps from show instance #".$showInstance);

12
airtime_mvc/application/models/ShowInstance.php
View file

@ -187,12 +187,12 @@ SQL;
if ($diff != 0) {
$sql = <<<SQL
UPDATE cc_schedule
SET starts = starts + INTERVAL :diff1 SECOND,
ends = ends + INTERVAL :diff2 SECOND
SET starts = starts + :diff1::INTERVAL SECOND,
ends = ends + :diff2::INTERVAL SECOND
WHERE instance_id = :instanceId
SQL;
Application_Common_Database::prepareAndExecute($sql,
array(
array(
':diff1' => $diff,
':diff2' => $diff,
':instanceId' => $instance_id ), 'execute');
@ -345,7 +345,7 @@ SQL;
//$sql = "SELECT timestamp '{$ends}' + interval '{$deltaDay} days' + interval '{$hours}:{$mins}'";
$sql = "SELECT timestamp :ends + interval :deltaDays + interval :deltaTime";
$now_ends = Application_Common_Database::prepareAndExecute($sql,
$now_ends = Application_Common_Database::prepareAndExecute($sql,
array(':ends' => $ends,
':deltaDays' => "$deltaDay days",
':deltaTime' => "{$hours}:{$mins}"), 'column'
@ -765,7 +765,7 @@ WHERE si.ends < :timeNow::TIMESTAMP
AND si.modified_instance = 'f'
ORDER BY si.ends DESC LIMIT 1;
SQL;
$id = Application_Common_Database( $sql, array(
$id = Application_Common_Database( $sql, array(
':timeNow' => $p_timeNow ), 'column' );
return ($id ? new Application_Model_ShowInstance($id) : null );
@ -818,7 +818,7 @@ SELECT count(*) AS cnt
FROM cc_show_instances
WHERE ends < :day
SQL;
return Application_Common_Database::prepareAndExecute( $sql,
return Application_Common_Database::prepareAndExecute( $sql,
array( ':day' => $day ), 'column' );
}

2
airtime_mvc/application/models/Webstream.php
View file

@ -216,9 +216,9 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
}
// TODO : Fix this interface
//This function should not be defined in the interface.
public function setMetadata($key, $val)
{
//This function should not be defined in the interface.
throw new Exception("Not implemented.");
}