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

Cleaned up some minor issues with last feature

Browse source
This commit is contained in:
Bram van der Veen 2015-08-15 21:55:20 +02:00
parent 3d0fb303e1
commit 78d7bbe31a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lookup.js
View file

@ -17,18 +17,18 @@ function get(req, res, next, search) {
if (!config().localDatabase) { if (!config().localDatabase) {
index.find({$or : [{id : search}, {name : search}, {first_name : search}, {last_name : search}, {username: search}]}).toArray(function (err, databaseEntry) { index.find({$or : [{id : search}, {name : search}, {first_name : search}, {last_name : search}, {username: search}]}).toArray(function (err, databaseEntry) {
if (err) console.warn(err); if (err) console.warn(err);
handle(req, next, databaseEntry); handle(req, res, next, databaseEntry);
}); });
} }
else { else {
index.find({$or : [{id : search}, {name : search}, {first_name : search}, {last_name : search}, {username: search}]}, function (err, databaseEntry) { index.find({$or : [{id : search}, {name : search}, {first_name : search}, {last_name : search}, {username: search}]}, function (err, databaseEntry) {
if (err) console.warn(err); if (err) console.warn(err);
handle(req, next, databaseEntry); handle(req, res, next, databaseEntry);
}); });
} }
} }
function handle(req, next, databaseEntry) { function handle(req, res, next, databaseEntry) {
if ((req.easter || {}).type == 'RIP') { if ((req.easter || {}).type == 'RIP') {
require('./auth').is(req, res, function () { require('./auth').is(req, res, function () {
res.render('schedule', req); res.render('schedule', req);

2
spider.js
View file

@ -3,7 +3,7 @@ var cheerio = require('cheerio');
var iconv = require('iconv-lite'); var iconv = require('iconv-lite');
var config = require('./configuration'); var config = require('./configuration');
var url = require('url'); var url = require('url');
var database = require('./')(); var database = require('./database')();
var scheduletypes = [ var scheduletypes = [
'Klasrooster', 'Klasrooster',