bram/rooster.io
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Forgot to implement new database functions on all lookup functions

Browse source
This commit is contained in:
Bram van der Veen 2015-08-17 11:32:56 +02:00
parent 954e85c37c
commit dd9375a541
1 changed files with 42 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
lookup.js
View file

@ -83,13 +83,24 @@ function api(req, callback) {
var index = database.collection('index');
var query = RegExp(req.query.name, 'i');
index.find({$or : [{id : query}, {name : query}, {first_name : query}, {last_name : query}, {username: query}, {group: query}]}).toArray(function (err, databaseEntry) {
if (err) callback({'error': err});
else {
for (entry of databaseEntry) {entry.url = makeUrl(req, entry)}
callback({'data': databaseEntry});
}
});
if (!config().localDatabase) {
index.find({$or : [{id : query}, {name : query}, {first_name : query}, {last_name : query}, {username: query}, {group: query}]}).toArray(function (err, databaseEntry) {
if (err) callback({'error': err});
else {
for (entry of databaseEntry) {entry.url = makeUrl(req, entry)}
callback({'data': databaseEntry});
}
});
}
else {
index.find({$or : [{id : query}, {name : query}, {first_name : query}, {last_name : query}, {username: query}, {group: query}]}, function (err, databaseEntry) {
if (err) callback({'error': err});
else {
for (entry of databaseEntry) {entry.url = makeUrl(req, entry)}
callback({'data': databaseEntry});
}
});
}
}
/**
@ -103,16 +114,30 @@ function list(req, res, next, list) {
var index = database.collection('index');
var query = RegExp(list, 'i');
index.find({group: list}).toArray(function (err, databaseEntry) {
if (err) {req.error = err; next();}
else {
if (databaseEntry.length < 1) require('./auth').is(req, res, function () {
res.render('not_found', req);
});
req.match = databaseEntry;
next();
}
});
if (!config().localDatabase) {
index.find({group: list}).toArray(function (err, databaseEntry) {
if (err) {req.error = err; next();}
else {
if (databaseEntry.length < 1) require('./auth').is(req, res, function () {
res.render('not_found', req);
});
req.match = databaseEntry;
next();
}
});
}
else {
index.find({group: list}, function (err, databaseEntry) {
if (err) {req.error = err; next();}
else {
if (databaseEntry.length < 1) require('./auth').is(req, res, function () {
res.render('not_found', req);
});
req.match = databaseEntry;
next();
}
});
}
}
/**