Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-18 20:40:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed broken view again

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-07-22 17:08:07 -04:00
parent 667a102c8b
commit e9afd4a107
4 changed files with 31 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/categories.js
View File

@@ -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);
});

15
src/posts.js
View File

@@ -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);
}
});
}

42
src/redis.js
View File

@@ -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));

10
src/user.js
View File

@@ -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;
}