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

- deleted old broken code from LiveLog.php

Browse source
This commit is contained in:
denise 2012-05-09 16:42:42 -04:00
parent de3e5a6e3c
commit 624ba85212
1 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
airtime_mvc/application/models/LiveLog.php
View file

@ -83,14 +83,6 @@ class Application_Model_LiveLog
public static function GetNumLogs() { public static function GetNumLogs() {
try { try {
$con = Propel::getConnection(); $con = Propel::getConnection();
/*
$sql = "SELECT count(*), state FROM CC_LIVE_LOG"
." WHERE (start_time >= (now() - INTERVAL '1 day'))"
." GROUP BY state";
$rows = $con->query($sql)->fetchAll();
return $rows;
*/
$sql = "SELECT count(*) FROM CC_LIVE_LOG" $sql = "SELECT count(*) FROM CC_LIVE_LOG"
." WHERE (start_time >= (now() - INTERVAL '1 day'))"; ." WHERE (start_time >= (now() - INTERVAL '1 day'))";
@ -142,19 +134,13 @@ class Application_Model_LiveLog
} }
if (($dj_live=='off' && $master_live=='off') || $state == 'S') { if (($dj_live=='off' && $master_live=='off') || $state == 'S') {
/*$sql = "SELECT max(id) FROM CC_LIVE_LOG" $sql = "SELECT id, state from cc_live_log"
." WHERE state = '$state'" ." where id in (select max(id) from cc_live_log)";
." UNION"
." SELECT max(id) FROM CC_LIVE_LOG";
*/
$sql = "SELECT id, state from cc_live_log where id in (select max(id) from cc_live_log)";
$row = $con->query($sql)->fetch(); $row = $con->query($sql)->fetch();
Logging::log($state);
Logging::log($row);
/* Only set end time if state recevied ($state) /* Only set end time if state recevied ($state)
* is the last row in cc_live_log * is the last row in cc_live_log
*/ */
//if ($row != null && $row['max'] == $row[0]) {
if ($row['state'] == $state) { if ($row['state'] == $state) {
$update_sql = "UPDATE CC_LIVE_LOG" $update_sql = "UPDATE CC_LIVE_LOG"
." SET end_time = '{$dateTime->format("Y-m-d H:i:s")}'" ." SET end_time = '{$dateTime->format("Y-m-d H:i:s")}'"
@ -162,7 +148,7 @@ class Application_Model_LiveLog
$con->exec($update_sql); $con->exec($update_sql);
} }
//if live broadcasting is off, turn scheduled play on //If live broadcasting is off, turn scheduled play on
$scheduled = Application_Model_Preference::GetSourceSwitchStatus('scheduled_play'); $scheduled = Application_Model_Preference::GetSourceSwitchStatus('scheduled_play');
if ($state == 'L' && $scheduled=='on') { if ($state == 'L' && $scheduled=='on') {
self::SetNewLogTime('S', $dateTime); self::SetNewLogTime('S', $dateTime);