From b70c8d1b5d77a0bca0feb24dcf7c0abcab382f62 Mon Sep 17 00:00:00 2001
From: naomiaro <naomiaro@gmail.com>
Date: Thu, 30 Sep 2010 14:51:07 -0400
Subject: [PATCH] more browse fixes

---
 src/modules/htmlUI/var/templates/scratchpad/main.tpl |  4 ++--
 src/modules/storageServer/var/BasicStor.php          |  6 ++++--
 src/modules/storageServer/var/install/install.php    | 11 ++++++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/modules/htmlUI/var/templates/scratchpad/main.tpl b/src/modules/htmlUI/var/templates/scratchpad/main.tpl
index dc3aa0fed..0d14f9815 100644
--- a/src/modules/htmlUI/var/templates/scratchpad/main.tpl
+++ b/src/modules/htmlUI/var/templates/scratchpad/main.tpl
@@ -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}
diff --git a/src/modules/storageServer/var/BasicStor.php b/src/modules/storageServer/var/BasicStor.php
index 580bc6f40..cb69d9a36 100644
--- a/src/modules/storageServer/var/BasicStor.php
+++ b/src/modules/storageServer/var/BasicStor.php
@@ -1294,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)) {
diff --git a/src/modules/storageServer/var/install/install.php b/src/modules/storageServer/var/install/install.php
index 357c3fedc..6b67cc6c7 100644
--- a/src/modules/storageServer/var/install/install.php
+++ b/src/modules/storageServer/var/install/install.php
@@ -310,9 +310,14 @@ if (!camp_db_table_exists($CC_CONFIG['playListContentsTable'])) {
 	CREATE TRIGGER calculate_position AFTER INSERT OR DELETE ON ".$CC_CONFIG['playListContentsTable']."
     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;
+    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
+    );
     
     ";