diff options
| -rw-r--r-- | node_simple.js | 24 | ||||
| -rw-r--r-- | routes/user.js | 1 |
2 files changed, 14 insertions, 11 deletions
diff --git a/node_simple.js b/node_simple.js index 426570a..2eab34c 100644 --- a/node_simple.js +++ b/node_simple.js @@ -350,18 +350,20 @@ exports.retrieve_userComments_history = function (username, callback) { _id: 0 }} ]).toArray(function (err, res) { - console.log("for Each here"); - var finised = _.after(res.length, doCall); // execute "doCall" only after res.length # of attempts - res.forEach(function (comment) { - console.log("for Each here"); - exams.find( { _id: ObjectId(comment.exam_id) } ).toArray(function (err, docs) { // get the exam info - comment.course_code = docs[0].course_code; - comment.year = docs[0].year; - comment.term = docs[0].term; - mylist.push(comment); // save it to array - finised(); + if(!res.length){ // Ensure a callback is executed if res is empty + callback(true, res); + }else{ + var finised = _.after(res.length, doCall); // execute "doCall" only after res.length # of attempts + res.forEach(function (comment) { + exams.find( { _id: ObjectId(comment.exam_id) } ).toArray(function (err, docs) { // get the exam info + comment.course_code = docs[0].course_code; + comment.year = docs[0].year; + comment.term = docs[0].term; + mylist.push(comment); // save it to array + finised(); + }); }); - }); + } }); function doCall() { diff --git a/routes/user.js b/routes/user.js index b89ff2f..f5c2099 100644 --- a/routes/user.js +++ b/routes/user.js @@ -55,6 +55,7 @@ router.get('/user_profile', loggedIn, isUser, function(req, res, next) { function getMail(){ console.log('ing getMail'); return new Promise(function(resolve, reject) { + dbFile.checkMailbox(req.user.user_name, function(success, error, data, message){ if (success) { inbox = data; |