From e48f044e5628e1d7eb3d3a60ada32c1bb7f451dd Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Fri, 15 Apr 2011 12:26:59 -0400
Subject: [PATCH 1/3] -CC-2192: Schedule sent to pypo is not sorted by start
 time.

---
 airtime_mvc/application/models/Schedule.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php
index 4f2b4cd8d..4d68df7b3 100644
--- a/airtime_mvc/application/models/Schedule.php
+++ b/airtime_mvc/application/models/Schedule.php
@@ -190,7 +190,8 @@ class ScheduleGroup {
         ." LEFT JOIN $CC_CONFIG[showInstances] as si"
         ." ON st.instance_id = si.id"
         ." WHERE st.group_id=$this->groupId"
-        ." AND st.starts < si.ends";
+        ." AND st.starts < si.ends"
+        ." ORDER BY st.starts";
         return $CC_DBC->GetAll($sql);
     }
 

From 6db16bc6d11f34626babca0f5a77041028d0db2a Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Fri, 15 Apr 2011 12:27:25 -0400
Subject: [PATCH 2/3] -update paths logs for utils in dev_tools/

---
 dev_tools/pl.sh | 2 +-
 dev_tools/pr.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev_tools/pl.sh b/dev_tools/pl.sh
index 4e1c70134..9d3729e15 100755
--- a/dev_tools/pl.sh
+++ b/dev_tools/pl.sh
@@ -2,4 +2,4 @@
 echo
 echo "This will tail the pypo-liquidsoap log file."
 echo "Type in password for pypo user (default password is 'pypo'):"
-su -l pypo -c "tail -F /etc/service/pypo-liquidsoap/log/main/current"
+su -l pypo -c "tail -F /var/log/airtime/pypo-liquidsoap/main/current"
diff --git a/dev_tools/pr.sh b/dev_tools/pr.sh
index aadab42ec..9734704b8 100755
--- a/dev_tools/pr.sh
+++ b/dev_tools/pr.sh
@@ -4,4 +4,4 @@ echo
 echo "This will tail the recorder log file."
 echo "Type in password for pypo user (default password is 'pypo'):"
 
-su -l pypo -c "tail -F /etc/service/recorder/log/main/current"
+su -l pypo -c "tail -F /var/log/airtime/recorder/log/main/current"

From 0320c9a1367b4922a7657968342ee692091cd925 Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Fri, 15 Apr 2011 12:35:57 -0400
Subject: [PATCH 3/3] -fix to dev_tools/pr.sh path

---
 dev_tools/pr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev_tools/pr.sh b/dev_tools/pr.sh
index 9734704b8..42a0aa669 100755
--- a/dev_tools/pr.sh
+++ b/dev_tools/pr.sh
@@ -4,4 +4,4 @@ echo
 echo "This will tail the recorder log file."
 echo "Type in password for pypo user (default password is 'pypo'):"
 
-su -l pypo -c "tail -F /var/log/airtime/recorder/log/main/current"
+su -l pypo -c "tail -F /var/log/airtime/recorder/main/current"