From be90839dbe942fd474ab56dd8b311f4541f99ca2 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Thu, 18 Sep 2014 18:21:27 -0400
Subject: [PATCH] Added description field to database calls for getting API
 information

---
 airtime_mvc/application/models/Show.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index ecee18275..e24b153bb 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -877,6 +877,7 @@ SELECT si1.starts            AS starts,
        si1.instance_id       AS record_id,
        si1.show_id           AS show_id,
        show.name             AS name,
+       show.description      AS description,
        show.color            AS color,
        show.background_color AS background_color,
        show.image_path       AS image_path,
@@ -1077,6 +1078,7 @@ SQL;
 SELECT si.starts AS start_timestamp,
        si.ends AS end_timestamp,
        s.name,
+       s.description,
        s.id,
        si.id AS instance_id,
        si.record,
@@ -1129,6 +1131,7 @@ SQL;
 SELECT si.starts AS start_timestamp,
        si.ends AS end_timestamp,
        s.name,
+       s.description,
        s.id,
        si.id AS instance_id,
        si.record,
@@ -1178,7 +1181,8 @@ SQL;
                                 "id"              => $rows[$i-1]['id'],
                                 "instance_id"     => $rows[$i-1]['instance_id'],
                                 "name"            => $rows[$i-1]['name'],
-                                "url"             => $rows[$i-1]['url'],
+                                "description"     => $rows[$i-1]['description'],
+                    			"url"             => $rows[$i-1]['url'],
                                 "start_timestamp" => $rows[$i-1]['start_timestamp'],
                                 "end_timestamp"   => $rows[$i-1]['end_timestamp'],
                                 "starts"          => $rows[$i-1]['starts'],
@@ -1195,7 +1199,8 @@ SQL;
                                 "id"              => $rows[$i+1]['id'],
                                 "instance_id"     => $rows[$i+1]['instance_id'],
                                 "name"            => $rows[$i+1]['name'],
-                                "url"             => $rows[$i+1]['url'],
+                                "description"     => $rows[$i+1]['description'],
+                    			"url"             => $rows[$i+1]['url'],
                                 "start_timestamp" => $rows[$i+1]['start_timestamp'],
                                 "end_timestamp"   => $rows[$i+1]['end_timestamp'],
                                 "starts"          => $rows[$i+1]['starts'],
@@ -1216,7 +1221,8 @@ SQL;
                                 "id"              => $rows[$i]['id'],
                                 "instance_id"     => $rows[$i]['instance_id'],
                                 "name"            => $rows[$i]['name'],
-                                "url"             => $rows[$i]['url'],
+                                "description"     => $rows[$i]['description'],
+                				"url"             => $rows[$i]['url'],
                                 "start_timestamp" => $rows[$i]['start_timestamp'],
                                 "end_timestamp"   => $rows[$i]['end_timestamp'],
                                 "starts"          => $rows[$i]['starts'],
@@ -1234,7 +1240,8 @@ SQL;
                     "id"              => $rows[$previousShowIndex]['id'],
                     "instance_id"     => $rows[$previousShowIndex]['instance_id'],
                     "name"            => $rows[$previousShowIndex]['name'],
-                    "start_timestamp" => $rows[$previousShowIndex]['start_timestamp'],
+                    "description"     => $rows[$previousShowIndex]['description'],
+                	"start_timestamp" => $rows[$previousShowIndex]['start_timestamp'],
                     "end_timestamp"   => $rows[$previousShowIndex]['end_timestamp'],
                     "starts"          => $rows[$previousShowIndex]['starts'],
                     "ends"            => $rows[$previousShowIndex]['ends'],
@@ -1271,6 +1278,7 @@ SQL;
 SELECT si.starts AS start_timestamp,
        si.ends AS end_timestamp,
        s.name,
+       s.description,
        s.id,
        si.id AS instance_id,
        si.record,