Forgot to implement new database functions on all lookup functions
This commit is contained in:
parent
954e85c37c
commit
dd9375a541
25
lookup.js
25
lookup.js
|
@ -83,6 +83,7 @@ function api(req, callback) {
|
||||||
var index = database.collection('index');
|
var index = database.collection('index');
|
||||||
var query = RegExp(req.query.name, 'i');
|
var query = RegExp(req.query.name, 'i');
|
||||||
|
|
||||||
|
if (!config().localDatabase) {
|
||||||
index.find({$or : [{id : query}, {name : query}, {first_name : query}, {last_name : query}, {username: query}, {group: query}]}).toArray(function (err, databaseEntry) {
|
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});
|
if (err) callback({'error': err});
|
||||||
else {
|
else {
|
||||||
|
@ -91,6 +92,16 @@ function api(req, callback) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
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});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function for listing all of the students in a group.
|
* Function for listing all of the students in a group.
|
||||||
|
@ -103,6 +114,7 @@ function list(req, res, next, list) {
|
||||||
var index = database.collection('index');
|
var index = database.collection('index');
|
||||||
var query = RegExp(list, 'i');
|
var query = RegExp(list, 'i');
|
||||||
|
|
||||||
|
if (!config().localDatabase) {
|
||||||
index.find({group: list}).toArray(function (err, databaseEntry) {
|
index.find({group: list}).toArray(function (err, databaseEntry) {
|
||||||
if (err) {req.error = err; next();}
|
if (err) {req.error = err; next();}
|
||||||
else {
|
else {
|
||||||
|
@ -114,6 +126,19 @@ function list(req, res, next, list) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function for making an url based on the found database match.
|
* Function for making an url based on the found database match.
|
||||||
|
|
Loading…
Reference in a new issue