fixed broken view again

v1.18.x
Baris Soner Usakli 12 years ago
parent 667a102c8b
commit e9afd4a107

@ -345,16 +345,9 @@ var RDB = require('./redis.js'),
} }
Categories.getCategoryFields = function(cid, fields, callback) { Categories.getCategoryFields = function(cid, fields, callback) {
RDB.hmget('category:' + cid, fields, function(err, data) { RDB.hmgetObject('category:' + cid, fields, function(err, data) {
if(err === null) { if(err === null)
var returnData = {}; callback(data);
for(var i=0, ii=fields.length; i<ii; ++i) {
returnData[fields[i]] = data[i];
}
callback(returnData);
}
else else
console.log(err); console.log(err);
}); });

@ -86,19 +86,14 @@ var RDB = require('./redis.js'),
}); });
} }
Posts.getPostFields = function(uid, fields, callback) { Posts.getPostFields = function(pid, fields, callback) {
RDB.hmget('post:' + uid, fields, function(err, data) { RDB.hmgetObject('post:' + pid, fields, function(err, data) {
if(err === null) { if(err === null) {
var returnData = {}; callback(data);
for(var i=0, ii=fields.length; i<ii; ++i) {
returnData[fields[i]] = data[i];
}
callback(returnData);
} }
else else {
console.log(err); console.log(err);
}
}); });
} }

@ -37,28 +37,26 @@
}; };
/* /*
* A lot of redis calls come back like this: * gets fields of a hash as an object instead of an array
* [key, value, key, value, key, value]
* this is a simple utility fn to turn this into an object.
*/ */
RedisDB.exports.objectify = function(arr) { RedisDB.exports.hmgetObject = function (key, fields, callback) {
var obj = {}; RedisDB.exports.hmget(key, fields, function(err, data) {
for (var i = 0; i < arr.length; i += 2) { if(err === null) {
obj[arr[i]] = arr[i+1]; var returnData = {};
for(var i=0, ii=fields.length; i<ii; ++i) {
returnData[fields[i]] = data[i];
} }
return obj;
};
/* callback(null, returnData);
* 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]; else {
}; console.log(err);
callback(err, null);
}
});
}
}(module)); }(module));

@ -126,13 +126,9 @@ var utils = require('./../public/src/utils.js'),
} }
User.getUserFields = function(uid, fields, callback) { 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) { if(err === null) {
for(var i = 0, returnData = {}, ii=fields.length; i<ii; ++i) { callback(data);
returnData[fields[i]] = data[i];
}
callback(returnData);
} else { } else {
console.log(err); console.log(err);
} }
@ -141,7 +137,7 @@ var utils = require('./../public/src/utils.js'),
User.getMultipleUserFields = function(uids, fields, callback) { User.getMultipleUserFields = function(uids, fields, callback) {
if(uids.length === 0) { if(uids.length === 0) {
callback({}); callback([]);
return; return;
} }

Loading…
Cancel
Save