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

Merge branch 'master' of dev.sourcefabric.org:airtime

This commit is contained in:
Martin Konecny 2013-05-10 13:20:07 -04:00
parent 2250d89cbd 5666b688a0
commit 0c4691f3ea
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
airtime_mvc/application/models/ListenerStat.php
View File

@ -46,7 +46,25 @@ SQL;
$out[$r['mount_name']][] = $r; $out[$r['mount_name']][] = $r;
} }
} }
return $out;
$enabledStreamIds = Application_Model_StreamSetting::getEnabledStreamIds();
$enabledOut = array();
foreach ($enabledStreamIds as $sId) {
$sql = "SELECT value FROM cc_stream_setting"
." WHERE keyname = :key";
$result = Application_Common_Database::prepareAndExecute($sql, array('key' => $sId."_mount"), "single");
$enabledMountPoint = $result["value"];
if (isset($out[$enabledMountPoint])) {
$enabledOut[$enabledMountPoint] = $out[$enabledMountPoint];
}
}
return $enabledOut;
} }
public static function insertDataPoints($p_dataPoints) { public static function insertDataPoints($p_dataPoints) {

18
airtime_mvc/application/models/StreamSetting.php
View File

@ -284,6 +284,7 @@ class Application_Model_StreamSetting
$con = Propel::getConnection(); $con = Propel::getConnection();
$update_time = Application_Model_Preference::GetStreamUpdateTimestemp(); $update_time = Application_Model_Preference::GetStreamUpdateTimestemp();
if ($boot_time == null || $boot_time > $update_time) { if ($boot_time == null || $boot_time > $update_time) {
$keyname = "s".$stream_id."_liquidsoap_error"; $keyname = "s".$stream_id."_liquidsoap_error";
$sql = "SELECT COUNT(*) FROM cc_stream_setting" $sql = "SELECT COUNT(*) FROM cc_stream_setting"
@ -311,7 +312,7 @@ class Application_Model_StreamSetting
$stmt = $con->prepare($sql); $stmt = $con->prepare($sql);
$stmt->bindParam(':keyname', $keyname); $stmt->bindParam(':keyname', $keyname);
$stmt->bindParam(':msg', $msg); $stmt->bindParam(':msg', $msg);
if ($stmt->execute()) { if ($stmt->execute()) {
//do nothing //do nothing
} else { } else {
@ -467,8 +468,19 @@ class Application_Model_StreamSetting
} }
public static function GetAllListenerStatErrors(){ public static function GetAllListenerStatErrors(){
$sql = "SELECT * FROM cc_stream_setting WHERE keyname like :p1"; $sql = "SELECT * FROM cc_stream_setting WHERE keyname like :p1";
return Application_Common_Database::prepareAndExecute($sql, array(':p1'=>'%_listener_stat_error')); $mounts = Application_Common_Database::prepareAndExecute($sql, array(':p1'=>'%_mount'));
$mps = array();
foreach($mounts as $mount) {
$mps[] = "'" .$mount["value"] . "_listener_stat_error'";
}
$in = implode(",", $mps);
$sql = "SELECT * FROM cc_stream_setting WHERE keyname IN ( $in )";
return Application_Common_Database::prepareAndExecute($sql, array());
} }
public static function SetListenerStatError($key, $v) { public static function SetListenerStatError($key, $v) {