diff --git a/src/database/mongo.js b/src/database/mongo.js index a9e17b8e02..d5b18b85dd 100644 --- a/src/database/mongo.js +++ b/src/database/mongo.js @@ -86,7 +86,7 @@ // key module.exists = function(key, callback) { - db.collection('objects').findOne({_key:key}, function(err, item) { + db.collection('objects').findOne({$or:[{_key:key}, {setName:key}]}, function(err, item) { callback(err, item !== undefined && item !== null); }); } @@ -176,9 +176,27 @@ } module.getObjects = function(keys, callback) { - db.collection('objects').find({_key:{$in:keys}}, {_id:0, _key:0}).toArray(function(err, data) { + db.collection('objects').find({_key:{$in:keys}}, {_id:0}).toArray(function(err, data) { + + if(err) { + return callback(err); + } + + var returnData = [], + resultIndex = 0; + + for(var i=0; i