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

moved sql.fogeojson? to sql?format=geojson

Browse Source
This commit is contained in:
Andrew W. Hill 2011-09-20 18:04:26 -07:00
parent bc2c828c9a
commit fd4bab78e1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/app.js
View File

@ -26,11 +26,9 @@ var express= require('express')
app.use(express.bodyParser()); app.use(express.bodyParser());
app.enable('jsonp callback'); app.enable('jsonp callback');
app.get('/api/v1/sql', function(req, res) { handleQuery(req, res, null) } ); app.get('/api/v1/sql', function(req, res) { handleQuery(req, res) } );
app.post('/api/v1/sql', function(req, res) { handleQuery(req, res, null) } ); app.post('/api/v1/sql', function(req, res) { handleQuery(req, res) } );
app.get('/api/v1/sql.:f', function(req, res) { handleQuery(req, res, req.params.f) } ); function handleQuery(req, res){
app.post('/api/v1/sql.:f', function(req, res) { handleQuery(req, res, req.params.f) } );
function handleQuery(req, res, format){
// sanitize input // sanitize input
var body = (req.body) ? req.body : {}; var body = (req.body) ? req.body : {};
@ -38,7 +36,8 @@ function handleQuery(req, res, format){
var database = req.query.database; // deprecate this in future var database = req.query.database; // deprecate this in future
var limit = parseInt(req.query.rows_per_page); var limit = parseInt(req.query.rows_per_page);
var offset = parseInt(req.query.page); var offset = parseInt(req.query.page);
var format = (req.query.format) ? req.query.format : null;
sql = (sql == "") ? null : sql; sql = (sql == "") ? null : sql;
database = (database == "") ? null : database; database = (database == "") ? null : database;
limit = (_.isNumber(limit)) ? limit : null; limit = (_.isNumber(limit)) ? limit : null;