Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes for searching for an empty playlist.

This commit is contained in:
naomiaro 2010-09-29 16:39:00 -04:00
parent dfe86e4423
commit 9e7ac33316
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/htmlUI/var/templates/menu.tpl
View File

@ -35,7 +35,7 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
</li> </li>
<li class="nav-main"><a>##Playlists##</a> <li class="nav-main"><a>##Playlists##</a>
<ul> <ul>
{if $PL->getActiveArr()} {if $PL->getActiveId()}
<li><a href="{$UI_BROWSER}?id={$START.fid}&act=PL.simpleManagement">##Edit Playlist##</a></li> <li><a href="{$UI_BROWSER}?id={$START.fid}&act=PL.simpleManagement">##Edit Playlist##</a></li>
{else} {else}
{if $PL->reportLookedPL()} {if $PL->reportLookedPL()}

13
src/modules/storageServer/var/BasicStor.php
View File

@ -1173,14 +1173,12 @@ class BasicStor {
} }
$sql = "SELECT * FROM ((".$plSelect."PL.id, 'playlist' AS ftype $sql = "SELECT * FROM ((".$plSelect."PL.id, 'playlist' AS ftype
FROM ".$CC_CONFIG["playListTable"]." AS PL, FROM ".$CC_CONFIG["playListTable"]." AS PL
(SELECT playlist_id AS id, text(SUM(cliplength)) AS length LEFT JOIN ".$CC_CONFIG['playListTimeView']." PLT ON PL.id = PLT.id)
FROM ".$CC_CONFIG["playListContentsTable"]." group by playlist_id) AS T
WHERE PL.id = T.id)
UNION UNION
".$fileSelect."id, ftype FROM " .$CC_CONFIG["filesTable"].") AS Content "; (".$fileSelect."id, ftype FROM ".$CC_CONFIG["filesTable"]." AS FILES)) AS RESULTS ";
$sql .= $whereClause; $sql .= $whereClause;
@ -1188,7 +1186,7 @@ class BasicStor {
$sql .= " ORDER BY ".join(",", $orderBySql); $sql .= " ORDER BY ".join(",", $orderBySql);
} }
$_SESSION["br"] = $sql; //$_SESSION["br"] = $sql;
$res = $CC_DBC->getAll($sql); $res = $CC_DBC->getAll($sql);
if (PEAR::isError($res)) { if (PEAR::isError($res)) {
@ -1199,6 +1197,7 @@ class BasicStor {
} }
$count = count($res); $count = count($res);
$_SESSION["br"] .= " COUNT: ".$count;
$res = array_slice($res, $offset != 0 ? $offset : 0, $limit != 0 ? $limit : 10); $res = array_slice($res, $offset != 0 ? $offset : 0, $limit != 0 ? $limit : 10);

1
src/modules/storageServer/var/conf.php
View File

@ -127,6 +127,7 @@ $CC_CONFIG['prefTable'] = $CC_CONFIG['tblNamePrefix'].'pref';
//$CC_CONFIG['playlogTable'] = $CC_CONFIG['tblNamePrefix'].'playlog'; //$CC_CONFIG['playlogTable'] = $CC_CONFIG['tblNamePrefix'].'playlog';
$CC_CONFIG['scheduleTable'] = $CC_CONFIG['tblNamePrefix'].'schedule'; $CC_CONFIG['scheduleTable'] = $CC_CONFIG['tblNamePrefix'].'schedule';
$CC_CONFIG['backupTable'] = $CC_CONFIG['tblNamePrefix'].'backup'; $CC_CONFIG['backupTable'] = $CC_CONFIG['tblNamePrefix'].'backup';
$CC_CONFIG['playListTimeView'] = $CC_CONFIG['tblNamePrefix'].'playlisttimes';
$CC_CONFIG['playListSequence'] = $CC_CONFIG['playListTable'].'_id'; $CC_CONFIG['playListSequence'] = $CC_CONFIG['playListTable'].'_id';
$CC_CONFIG['filesSequence'] = $CC_CONFIG['filesTable'].'_id'; $CC_CONFIG['filesSequence'] = $CC_CONFIG['filesTable'].'_id';

8
src/modules/storageServer/var/install/install.php
View File

@ -308,7 +308,13 @@ if (!camp_db_table_exists($CC_CONFIG['playListContentsTable'])) {
LANGUAGE 'plpgsql'; LANGUAGE 'plpgsql';
CREATE TRIGGER calculate_position AFTER INSERT OR DELETE ON ".$CC_CONFIG['playListContentsTable']." CREATE TRIGGER calculate_position AFTER INSERT OR DELETE ON ".$CC_CONFIG['playListContentsTable']."
FOR EACH ROW EXECUTE PROCEDURE calculate_position();"; FOR EACH ROW EXECUTE PROCEDURE calculate_position();
CREATE OR REPLACE VIEW cc_playlisttimes AS
SELECT playlist_id AS id, text(SUM(cliplength)) AS length
FROM ".$CC_CONFIG['playListContentsTable']." group by playlist_id;
";
camp_install_query($sql); camp_install_query($sql);