From 5d48ed5fb4f972421b23bd1e6fefd24afb754ee3 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Sat, 12 Oct 2013 10:37:44 -0400
Subject: [PATCH] using map instead of eachSeries to load categories for /home.
 Error handling.

---
 src/categories.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/categories.js b/src/categories.js
index 34cc9430e8..b34eac86da 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -325,33 +325,40 @@ var RDB = require('./redis.js'),
 			return;
 		}
 
-		var categories = [];
+		// var categories = [];
 
 		function getCategory(cid, callback) {
 			Categories.getCategoryData(cid, function(err, categoryData) {
-
 				if (err) {
-					callback(err);
+					winston.warn('Attempted to retrieve cid ' + cid + ', but nothing was returned!');
+					callback(null, null);
 					return;
 				}
 
 				Categories.hasReadCategory(cid, current_user, function(hasRead) {
 					categoryData.badgeclass = (parseInt(categoryData.topic_count, 10) === 0 || (hasRead && current_user !== 0)) ? '' : 'badge-important';
 
-					categories.push(categoryData);
-					callback(null);
+					// categories.push(categoryData);
+					callback(null, categoryData);
 				});
 			});
 		}
 
-		async.eachSeries(cids, getCategory, function(err) {
+		async.map(cids, getCategory, function(err, categories) {
 			if (err) {
 				winston.err(err);
 				callback(null);
 				return;
 			}
 
-			categories = categories.sort(function(a, b) { return parseInt(a.order, 10) - parseInt(b.order, 10); });
+			categories = categories.filter(function(category) {
+				// Remove categories that have errored out
+				if (category) return true;
+				else return false;
+			}).sort(function(a, b) {
+				// Sort categories into their defined order
+				return parseInt(a.order, 10) - parseInt(b.order, 10);
+			});
 
 			callback({
 				'categories': categories