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

CC-1665: Scheduled stream rebroadcasting and recording 

-fix SQL error
This commit is contained in:
Martin Konecny 2012-08-07 19:23:42 -04:00
parent 9b805f0a01
commit 47ae223a1c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
airtime_mvc/application/models/Schedule.php
View File

@ -265,16 +265,12 @@ class Application_Model_Schedule
sched.fade_in AS fade_in, sched.fade_out AS fade_out, sched.fade_in AS fade_in, sched.fade_out AS fade_out,
sched.playout_status AS playout_status, sched.playout_status AS playout_status,
--ft.track_title AS file_track_title, ft.artist_name AS file_artist_name,
--ft.album_title AS file_album_title, ft.length AS file_length, ft.file_exists AS file_exists
%%columns%% %%columns%%
FROM FROM
(( ((
--cc_schedule AS sched JOIN cc_files AS ft ON (sched.file_id = ft.id)
%%join%% %%join%%
--JOIN cc_webstream AS ws ON (sched.stream_id = ws.id)
JOIN cc_show AS showt ON (showt.id = si.show_id) JOIN cc_show AS showt ON (showt.id = si.show_id)
) )
@ -298,12 +294,13 @@ class Application_Model_Schedule
$filesSql); $filesSql);
$streamSql = str_replace("%%columns%%", $streamSql = str_replace("%%columns%%",
"ws.name AS file_track_title, ws.creator_id AS file_artist_name, "ws.name AS file_track_title, sub.login AS file_artist_name,
ws.description AS file_album_title, ws.length AS file_length, 't'::BOOL AS file_exists", ws.description AS file_album_title, ws.length AS file_length, 't'::BOOL AS file_exists",
$templateSql); $templateSql);
$streamSql = str_replace("%%join%%", $streamSql = str_replace("%%join%%",
"cc_schedule AS sched JOIN cc_webstream AS ws ON (sched.stream_id = ws.id) "cc_schedule AS sched JOIN cc_webstream AS ws ON (sched.stream_id = ws.id)
JOIN cc_show_instances AS si ON (si.id = sched.instance_id))", JOIN cc_show_instances AS si ON (si.id = sched.instance_id))
LEFT JOIN cc_subjs AS sub ON (ws.creator_id = sub.id)",
$streamSql); $streamSql);
$sql = "SELECT * FROM (($filesSql) UNION ($streamSql)) as temp ORDER BY si_starts, sched_starts"; $sql = "SELECT * FROM (($filesSql) UNION ($streamSql)) as temp ORDER BY si_starts, sched_starts";