From 504d9968f14a3f796636c25aced49608796e0ca4 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 6 Nov 2012 16:32:00 -0500
Subject: [PATCH] CC-4639: Give an option to allow smart blocks to reuse tracks
 if not enough tracks meet the time limit

- fixed the bug where airtime hangs when repeat is checked but 0 files that
meet criteria
- fixed dynamic block bug where it didn't generate correct list
---
 airtime_mvc/application/controllers/PlaylistController.php | 2 +-
 airtime_mvc/application/models/Block.php                   | 2 +-
 airtime_mvc/application/models/Scheduler.php               | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index 38dbd4fd2..0d2ead443 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -513,7 +513,7 @@ class PlaylistController extends Zend_Controller_Action
         } catch (BlockNotFoundException $e) {
             $this->playlistNotFound('block', true);
         } catch (Exception $e) {
-            //Logging::info($e);
+            Logging::info($e);
             $this->playlistUnknownError($e);
         }
     }
diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index 3aa0a1882..c06b24cb8 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -1191,7 +1191,7 @@ SQL;
         $sizeOfInsert = count($insertList);
         
         // if block is not full and reapeat_track is check, fill up more
-        while (!$isBlockFull && $repeat == 1) {
+        while (!$isBlockFull && $repeat == 1 && $sizeOfInsert > 0) {
             $randomEleKey = array_rand(array_slice($insertList, 0, $sizeOfInsert));
             $insertList[] = $insertList[$randomEleKey];
             $totalTime += $insertList[$randomEleKey]['length'];
diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php
index 356210b74..80f7ded9e 100644
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@@ -193,7 +193,8 @@ class Application_Model_Scheduler
                         }
                     } else {
                         $dynamicFiles = $bl->getListOfFilesUnderLimit();
-                        foreach ($dynamicFiles as $fileId=>$f) {
+                        foreach ($dynamicFiles as $f) {
+                            $fileId = $f['id'];
                             $file = CcFilesQuery::create()->findPk($fileId);
                             if (isset($file) && $file->getDbFileExists()) {
                                 $data["id"] = $file->getDbId();
@@ -250,7 +251,8 @@ class Application_Model_Scheduler
                 }
             } else {
                 $dynamicFiles = $bl->getListOfFilesUnderLimit();
-                foreach ($dynamicFiles as $fileId=>$f) {
+                foreach ($dynamicFiles as $f) {
+                    $fileId = $f['id'];
                     $file = CcFilesQuery::create()->findPk($fileId);
                     if (isset($file) && $file->getDbFileExists()) {
                         $data["id"] = $file->getDbId();
@@ -445,7 +447,6 @@ class Application_Model_Scheduler
                     } else {
                         $sched = new CcSchedule();
                     }
-                    Logging::info($file);
                     $sched->setDbStarts($nextStartDT)
                         ->setDbEnds($endTimeDT)
                         ->setDbCueIn($file['cuein'])