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

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

This commit is contained in:
denise 2012-08-09 18:24:32 -04:00
parent 10ea825536 200eec37f6
commit 5a63a284c8
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/AudiopreviewController.php
View File

@ -286,7 +286,7 @@ class AudiopreviewController extends Zend_Controller_Action
$elementMap['uri'] = "/api/get-media/file/".$track['item_id']; $elementMap['uri'] = "/api/get-media/file/".$track['item_id'];
} else { } else {
$elementMap['uri'] = $track['path']; $elementMap['uri'] = $track['filepath'];
} }
$result[] = $elementMap; $result[] = $elementMap;
} }

38
airtime_mvc/application/models/ShowInstance.php
View File

@ -648,11 +648,37 @@ class Application_Model_ShowInstance
{ {
$con = Propel::getConnection(); $con = Propel::getConnection();
$sql = "SELECT * $sql = <<<SQL
FROM (cc_schedule AS s LEFT JOIN cc_files AS f ON f.id = s.file_id) SELECT *
WHERE s.instance_id = '{$this->_instanceId}' AND s.playout_status >= 0 FROM (
ORDER BY starts"; (SELECT s.starts,
0::INTEGER as type ,
f.id AS item_id,
f.track_title,
f.artist_name AS creator,
f.file_exists AS EXISTS,
f.filepath AS filepath
FROM cc_schedule AS s
LEFT JOIN cc_files AS f ON f.id = s.file_id
WHERE s.instance_id = '{$this->_instanceId}'
AND s.playout_status >= 0
AND s.file_id IS NOT NULL)
UNION
(SELECT s.starts,
1::INTEGER as type,
ws.id AS item_id,
(ws.name || ': ' || ws.url) AS title,
sub.login AS creator,
't'::boolean AS EXISTS,
ws.url AS filepath
FROM cc_schedule AS s
LEFT JOIN cc_webstream AS ws ON ws.id = s.stream_id
LEFT JOIN cc_subjs AS sub ON ws.creator_id = sub.id
WHERE s.instance_id = '{$this->_instanceId}'
AND s.playout_status >= 0
AND s.stream_id IS NOT NULL)) AS temp
ORDER BY starts;
SQL;
$results = $con->query($sql)->fetchAll(PDO::FETCH_ASSOC); $results = $con->query($sql)->fetchAll(PDO::FETCH_ASSOC);
@ -681,7 +707,7 @@ class Application_Model_ShowInstance
$query = $con->query($sql)->fetchColumn(0); $query = $con->query($sql)->fetchColumn(0);
return ($query !== false) ? $query : NULL; return ($query !== false) ? $query : null;
} }
public function getShowEndGapTime() public function getShowEndGapTime()