interim commit

v1.18.x
Julian Lam 12 years ago
parent 8133ac53de
commit 08c303b3c7

@ -26,7 +26,8 @@
"less-middleware": "0.1.11",
"marked": "0.2.8",
"bcrypt": "0.7.5",
"node-gyp": "0.9.5"
"node-gyp": "0.9.5",
"async": "0.2.8"
},
"devDependencies": {},
"optionalDependencies": {},

@ -1,7 +1,8 @@
var RDB = require('./redis.js'),
utils = require('./utils.js'),
marked = require('marked'),
user = require('./user.js');
user = require('./user.js'),
async = require('async');
(function(Posts) {
//data structure
@ -18,6 +19,55 @@ var RDB = require('./redis.js'),
if (start == null) start = 0;
if (end == null) end = start + 10;
// async.parallel({
// details: function(callback) {
// RDB.get('tid:' + tid + ':title', function(topic_name) {
// callback(null, {
// 'topic_name': topic_name
// });
// });
// },
// posts: function(callback) {
// var participant_uids = [],
// post_calls = [];
// RDB.lrange('tid:' + tid + ':posts', start, end, function(pids) {
// var content = [],
// uid = [],
// timestamp = [],
// pid = [],
// post_rep = [];
// for (var i=0, ii=pids.length; i<ii; i++) {
// content.push('pid:' + pids[i] + ':content');
// uid.push('pid:' + pids[i] + ':uid');
// timestamp.push('pid:' + pids[i] + ':timestamp');
// post_rep.push('pid:' + pids[i] + ':rep');
// pid.push(pids[i]);
// }
// if (pids.length > 0) {
// RDB.multi()
// .mget(content)
// .mget(uid)
// .mget(timestamp)
// .mget(post_rep)
// .exec(function(err, replies) {
// content = replies[0];
// uid = replies[1];
// timestamp = replies[2];
// post_rep = replies[3];
// callback(null, replies);
// }
// );
// }
// });
// }
// }, function(err, results) {
// callback(results);
// });
// return;
RDB.get('tid:' + tid + ':title', function(topic_name) { //do these asynch later
RDB.lrange('tid:' + tid + ':posts', start, end, function(pids) {
var content = [],

@ -298,6 +298,12 @@ passport.deserializeUser(function(uid, done) {
res.send('User profile for uid: ' + uid);
});
});
app.get('/test', function(req, res) {
global.modules.posts.get(function(data) {
res.send('<pre>' + JSON.stringify(data) + '</pre>');
}, 1, 1);
});
}(WebServer));
server.listen(config.port);

Loading…
Cancel
Save