Merge branch 'develop' of ssh://git.idiopolis.nl:2222/dreamer/PreviouslyOnIFM into develop

code/handlers/artisthandler.lua

@@ -37,18 +37,18 @@ local function Artisthandler(self)
 
   for i, track in ipairs(tracks) do
     local airtimes = db.query([[
-            SELECT airtime
+      SELECT airtime, station AS station_id
       FROM airtimes
       WHERE track = ?
     ]], track["id"])
 
     artist["tracks"][i]["airtimes"] = {}
     for j, airtime in ipairs(airtimes) do
-        table.insert(artist["tracks"][i]["airtimes"], airtime['airtime'])
+        table.insert(artist["tracks"][i]["airtimes"], airtime)
     end
 
     local releases = db.query([[
-      SELECT release.id, release.name AS release_name
+      SELECT release.id AS release_id, release.name AS release_name
       FROM track_releases
       INNER JOIN
         releases AS release ON (track_releases.release = release.id)

code/handlers/releasehandler.lua

@@ -41,14 +41,14 @@ local function Releasehandler(self)
 
   for i, track in ipairs(tracks) do
     local airtimes = db.query([[
-            SELECT airtime
+      SELECT airtime, station AS station_id
       FROM airtimes
       WHERE track = ?
     ]], track["id"])
 
     release["tracks"][i]["airtimes"] = {}
     for j, airtime in ipairs(airtimes) do
-        table.insert(release["tracks"][i]["airtimes"], airtime['airtime'])
+        table.insert(release["tracks"][i]["airtimes"], airtime)
     end
   end
 

code/handlers/trackhandler.lua

@@ -29,7 +29,7 @@ local function Trackhandler(self)
     SELECT artist.name AS artist_name
     FROM track_artists
     INNER JOIN
-            artists as artist ON (track_artists.artist = artist.id)
+        artists AS artist ON (track_artists.artist = artist.id)
     WHERE track_artists.track = ?
   ]], track["id"])
 
@@ -37,18 +37,18 @@ local function Trackhandler(self)
   track["artist"] = artists[1]["artist_name"]
 
   local airtimes = db.query([[
-      SELECT airtime
+    SELECT airtime, station AS station_id
     FROM airtimes
     WHERE track = ?
   ]], track["id"])
 
   track["airtimes"] = {}
   for i, airtime in ipairs(airtimes) do
-    track["airtimes"][i] = airtime.airtime
+    track["airtimes"][i] = airtime
   end
 
   local releases = db.query([[
-    SELECT release.id, release.name AS release_name
+    SELECT release.id AS release_id, release.name AS release_name
     FROM track_releases
     INNER JOIN
       releases AS release ON (track_releases.release = release.id)