cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove args trim (broken for some reason) and funcionise exception handler

Browse Source
This commit is contained in:
Simon Tokumine 2011-06-13 13:07:21 +01:00
parent 21277ff9d2
commit 423e156552
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/app.js
View File

@ -25,11 +25,11 @@ var app = require('express').createServer()
app.get('/v1/', function(req, res){
//sanitize input
var sql = _.trim(req.query.sql);
var database = _.trim(req.query.database); // needed if the user fails the auth to specify public access
var sql = req.query.sql;
var database = req.query.database;
sql = (sql == "") ? null : sql;
database = (database == "") ? null : database;
database = (database == "") ? null : database;
try {
if (!_.isString(sql)) throw new Error("You must indicate a sql query");
var pg;
@ -49,13 +49,18 @@ app.get('/v1/', function(req, res){
res.send(result.rows);
},
function exceptionHandle(err, result){
res.send({error:[err.message]}, 400);
handleException(res,err);
}
);
} catch (err) {
res.send({error:[err.message]}, 400);
handleException(res,err);
}
});
function handleException(res, err){
var msg = (global.settings.environment == 'development') ? {error:[err.message], stack: err.stack} : {error:[err.message]}
res.send(msg, 400);
}
app.listen(global.settings.node_port);
//module.exports = app;