From a1e653b41f0657ca8d366897e0c824cd993fe7a5 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Fri, 19 Oct 2012 13:22:00 -0400
Subject: [PATCH 1/2] Deep optimization

---
 airtime_mvc/application/models/Show.php       |  7 ++++---
 .../application/models/ShowInstance.php       | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index 5da348b52..0006057f7 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -1743,7 +1743,8 @@ SQL;
         $days     = $interval->format('%a');
         $shows    = Application_Model_Show::getShows($p_start, $p_end);
         $nowEpoch = time();
-
+        $content_count = Application_Model_ShowInstance::getContentCount(
+            $p_start, $p_end);
         $timezone = date_default_timezone_get();
 
         foreach ($shows as $show) {
@@ -1789,9 +1790,9 @@ SQL;
 
             $showInstance = new Application_Model_ShowInstance(
                 $show["instance_id"]);
-            //$showContent = $showInstance->getShowListContent();
 
-            $options["show_empty"] = ($showInstance->showEmpty()) ? 1 : 0;
+            $options["show_empty"] = (array_key_exists($show['instance_id'],
+                $content_count)) ? 1 : 0;
 
             $events[] = &self::makeFullCalendarEvent($show, $options,
                 $startsDT, $endsDT, $startsEpochStr, $endsEpochStr);
diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php
index e657494f9..8854f3896 100644
--- a/airtime_mvc/application/models/ShowInstance.php
+++ b/airtime_mvc/application/models/ShowInstance.php
@@ -662,6 +662,27 @@ SQL;
     }
 
 
+
+    public static function getContentCount($p_start, $p_end) 
+    {                 
+        $sql = <<<SQL
+SELECT instance_id,
+       count(*) AS instance_count
+FROM cc_schedule
+WHERE ends > :p_start::TIMESTAMP
+  AND starts < :p_end::TIMESTAMP
+GROUP BY instance_id;
+SQL;                                                                           
+
+        $counts = Application_Common_Database::prepareAndExecute( $sql, array( 
+            ':p_start' => $p_start->format("Y-m-d G:i:s"),                         
+            ':p_end' => $p_end->format("Y-m-d G:i:s"))
+        , 'all');                    
+                                                                                
+        return $counts;                                                        
+                                                                               
+    }                                                                          
+
     public function showEmpty()
     {
         $sql = <<<SQL

From 57ef1c20ac89971e154b3481e5c239723cd60082 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Fri, 19 Oct 2012 13:24:06 -0400
Subject: [PATCH 2/2] Removed trailing whitespace

---
 airtime_mvc/application/models/ShowInstance.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php
index 8854f3896..5b60e1f70 100644
--- a/airtime_mvc/application/models/ShowInstance.php
+++ b/airtime_mvc/application/models/ShowInstance.php
@@ -671,16 +671,16 @@ SELECT instance_id,
 FROM cc_schedule
 WHERE ends > :p_start::TIMESTAMP
   AND starts < :p_end::TIMESTAMP
-GROUP BY instance_id;
-SQL;                                                                           
+GROUP BY instance_id
+SQL;
 
-        $counts = Application_Common_Database::prepareAndExecute( $sql, array( 
-            ':p_start' => $p_start->format("Y-m-d G:i:s"),                         
+        $counts = Application_Common_Database::prepareAndExecute( $sql, array(
+            ':p_start' => $p_start->format("Y-m-d G:i:s"),
             ':p_end' => $p_end->format("Y-m-d G:i:s"))
-        , 'all');                    
-                                                                                
-        return $counts;                                                        
-                                                                               
+        , 'all');
+
+        return $counts;
+
     }                                                                          
 
     public function showEmpty()