changed the JSON structure returned by requests sent to /artworks

diff --git a/public/js/home.js b/public/js/home.js
index 98c56ee8d23b50b8901fdab9b87e59136c4cb5ec..238bdb5db5bd98ebb434ad0c0b63dcfae080cf4d 100644 (file)
--- a/public/js/home.js
+++ b/public/js/home.js
@@ -6,11 +6,10 @@
     }
   });
   $.get('/artworks', function(data) {
-    $('.thumbnail').each(function(index) {
-      var i = index * 6;
-      var j = i + 6;
-      for(i; i < j; i++) {
-        $('<img src="'+data.results[i]+'" />').appendTo($(this));
+    $('.thumbnail').each(function() {
+      var urls = data[$(this).attr('href')];
+      for (var i = 0; i < urls.length; i++) {
+        $('<img src="'+urls[i]+'" />').appendTo($(this));
       }
     });
   });

diff --git a/routes/site.js b/routes/site.js
index 42d41778187c652a4a868242a33094723cd4de91..a6c77db69afff5cadb555d117040b9339608749c 100644 (file)
--- a/routes/site.js
+++ b/routes/site.js
@@ -12,10 +12,10 @@ var async = require('async')
   , trackscount = utils.trackscount;
 
 /**
- * Generate a task.
+ * Generate a sub-task.
  */
 
-var task = function(genre) {
+var subTask = function(genre) {
   return function(callback) {
     var index = randInt(trackscount[genre]);
     db.zrange(genre, index, index, function(err, res) {
@@ -29,18 +29,18 @@ var task = function(genre) {
  */
 
 exports.artworks = function(req, res) {
-  var tasks = [];
-  for (var i=0; i<rooms.length; i++) {
-    for (var j=0; j<6; j++) {
-      tasks.push(task(rooms[i]));
-    }
-  }
-  async.parallel(tasks, function(err, results) {
-    var obj = {
-      resultCount: results.length,
-      results: results
+  var tasks = {};
+  rooms.forEach(function(room) {
+    tasks[room] = function(callback) {
+      var subtasks = [];
+      for (var i = 0; i < 6; i++) {
+        subtasks.push(subTask(room));
+      }
+      async.parallel(subtasks, callback);
     };
-    res.json(obj);
+  });
+  async.parallel(tasks, function(err, results) {
+    res.json(results);
   });
 };