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

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

This commit is contained in:
paul.baranowski 2010-09-30 15:32:12 -04:00
parent d9c6971131 b70c8d1b5d
commit dba897c3f8
5 changed files with 26 additions and 13 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 class="nav-main"><a>##Playlists##</a>
<ul>
{if $PL->getActiveArr()}
{if $PL->getActiveId()}
<li><a href="{$UI_BROWSER}?id={$START.fid}&act=PL.simpleManagement">##Edit Playlist##</a></li>
{else}
{if $PL->reportLookedPL()}

4
src/modules/htmlUI/var/templates/scratchpad/main.tpl
View File

@ -26,7 +26,7 @@
<td {include file="scratchpad/actionhandler.tpl"} style="cursor: pointer">
{if $i.type|lower == "playlist"}
{if $_PL_activeId == $i.id}
{if $i.type == 'playlist' && $PL->isAvailable($i.id) == false}
<div style="font-weight: bold; cursor: pointer">
{else}
<div style="cursor: pointer">
@ -40,7 +40,7 @@
{assign var="_duration" value=$i.duration}
<td {include file="scratchpad/actionhandler.tpl"} style="text-align: right; cursor: pointer">{niceTime in=$_duration}</td>
<td {include file="scratchpad/actionhandler.tpl"} style="border: 0; text-align: center; cursor: pointer">
{if $_PL_activeId == $i.id}
{if $i.type == 'playlist' && $PL->isAvailable($i.id) == false}
<div align="left"><img src="img/ico_lock.png">
<img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {* include file="sub/alttext.tpl"*} /></div>
{else}

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

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

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['scheduleTable'] = $CC_CONFIG['tblNamePrefix'].'schedule';
$CC_CONFIG['backupTable'] = $CC_CONFIG['tblNamePrefix'].'backup';
$CC_CONFIG['playListTimeView'] = $CC_CONFIG['tblNamePrefix'].'playlisttimes';
$CC_CONFIG['playListSequence'] = $CC_CONFIG['playListTable'].'_id';
$CC_CONFIG['filesSequence'] = $CC_CONFIG['filesTable'].'_id';

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

@ -308,7 +308,18 @@ if (!camp_db_table_exists($CC_CONFIG['playListContentsTable'])) {
LANGUAGE 'plpgsql';
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 PL.id, COALESCE(T.length, '00:00:00') AS length
from ".$CC_CONFIG['playListTable']." AS PL LEFT JOIN
(SELECT playlist_id AS id, text(SUM(cliplength)) AS length
FROM ".$CC_CONFIG['playListContentsTable']." GROUP BY playlist_id) AS T
ON PL.id = T.id
);
";
camp_install_query($sql);