From e9afd4a1077f6909e5cd9947911e869ee1ed8880 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Mon, 22 Jul 2013 17:08:07 -0400
Subject: [PATCH] fixed broken view again

---
 src/categories.js | 13 +++----------
 src/posts.js      | 15 +++++----------
 src/redis.js      | 42 ++++++++++++++++++++----------------------
 src/user.js       | 10 +++-------
 4 files changed, 31 insertions(+), 49 deletions(-)

diff --git a/src/categories.js b/src/categories.js
index 8f5638be21..c1c05f486b 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -345,16 +345,9 @@ var	RDB = require('./redis.js'),
 	}
 	
 	Categories.getCategoryFields = function(cid, fields, callback) {
-		RDB.hmget('category:' + cid, fields, function(err, data) {
-			if(err === null) {
-				var returnData = {};
-				
-				for(var i=0, ii=fields.length; i<ii; ++i) {
-					returnData[fields[i]] = data[i];
-				}
-
-				callback(returnData);
-			}
+		RDB.hmgetObject('category:' + cid, fields, function(err, data) {
+			if(err === null) 
+				callback(data);
 			else
 				console.log(err);
 		});		
diff --git a/src/posts.js b/src/posts.js
index fb39b77c90..42ce8103bb 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -86,19 +86,14 @@ var	RDB = require('./redis.js'),
 		});
 	}
 
-	Posts.getPostFields = function(uid, fields, callback) {
-		RDB.hmget('post:' + uid, fields, function(err, data) {
+	Posts.getPostFields = function(pid, fields, callback) {
+		RDB.hmgetObject('post:' + pid, fields, function(err, data) {
 			if(err === null) {
-				var returnData = {};
-				
-				for(var i=0, ii=fields.length; i<ii; ++i) {
-					returnData[fields[i]] = data[i];
-				}
-
-				callback(returnData);
+				callback(data);
 			}
-			else
+			else {
 				console.log(err);
+			}
 		});		
 	}
 
diff --git a/src/redis.js b/src/redis.js
index 54b0850cf9..caefad7125 100644
--- a/src/redis.js
+++ b/src/redis.js
@@ -37,28 +37,26 @@
 	};
 
 	/*
-	* A lot of redis calls come back like this:
-	* [key, value, key, value, key, value]
-	* this is a simple utility fn to turn this into an object.
-	*/
-	RedisDB.exports.objectify = function(arr) {
-		var obj = {};
-		for (var i = 0; i < arr.length; i += 2) {
-		    obj[arr[i]] = arr[i+1];
-		}
-		return obj;
-	};
+	 * gets fields of a hash as an object instead of an array
+	 */
+	RedisDB.exports.hmgetObject = function (key, fields, callback) {
+		RedisDB.exports.hmget(key, fields, function(err, data) {
+			if(err === null) {
+				var returnData = {};
+				
+				for(var i=0, ii=fields.length; i<ii; ++i) {
+					returnData[fields[i]] = data[i];
+				}
+
+				callback(null, returnData);
+			}
+			else {
+				console.log(err);
+				callback(err, null);
+			}
+		});		
+	}	
+
 
-	/*
-	* Similar to .objectify, this utility function splits the data array into two arrays
-	*/
-	RedisDB.exports.splitify = function(arr) {
-		var arr1 = [], arr2 = [];
-		for (var i = 0; i < arr.length; i += 2) {
-		    arr1.push(arr[i]);
-		    arr2.push(arr[i+1]);
-		}
-		return [arr1,arr2];
-	};
 
 }(module));
\ No newline at end of file
diff --git a/src/user.js b/src/user.js
index d741fe3b87..65909b5c15 100644
--- a/src/user.js
+++ b/src/user.js
@@ -126,13 +126,9 @@ var utils = require('./../public/src/utils.js'),
 	}
 
 	User.getUserFields = function(uid, fields, callback) {
-		RDB.hmget('user:' + uid, fields, function(err, data) {
+		RDB.hmgetObject('user:' + uid, fields, function(err, data) {
 			if(err === null) {
-				for(var i = 0, returnData = {}, ii=fields.length; i<ii; ++i) {
-					returnData[fields[i]] = data[i];
-				}
-
-				callback(returnData);
+				callback(data);
 			} else {
 				console.log(err);
 			}
@@ -141,7 +137,7 @@ var utils = require('./../public/src/utils.js'),
 
 	User.getMultipleUserFields = function(uids, fields, callback) {
 		if(uids.length === 0) {
-			callback({});
+			callback([]);
 			return;
 		}