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

Correctly accept custom options for formats in ogr.js

Browse Source
This commit is contained in:
Javier Torres 2017-01-11 19:03:11 +01:00
parent d680da0548
commit 4f8fa92272
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/formats/ogr.js
View File

@ -60,10 +60,10 @@ OgrFormat.prototype.toOGR = function(options, out_format, out_filename, callback
var ogr2ogr = global.settings.ogr2ogrCommand || 'ogr2ogr';
var dbhost = dbopts.host;
var dbport = dbopts.port;
var dbuser = dbopts.user;
var dbport = dbopts.port;
var dbuser = dbopts.user;
var dbpass = dbopts.pass;
var dbname = dbopts.dbname;
var dbname = dbopts.dbname;
var that = this;
@ -72,7 +72,7 @@ OgrFormat.prototype.toOGR = function(options, out_format, out_filename, callback
var pg;
// Drop ending semicolon (ogr doens't like it)
sql = sql.replace(/;\s*$/, '');
sql = sql.replace(/;\s*$/, '');
step (
@ -162,7 +162,7 @@ OgrFormat.prototype.toOGR = function(options, out_format, out_filename, callback
}
if (options.cmd_params){
ogrargs.concat(options.cmd_params);
ogrargs = ogrargs.concat(options.cmd_params);
}
ogrargs.push('-nln', out_layername);
@ -318,7 +318,7 @@ ExportRequest.prototype.sendFile = function (err, filename, callback) {
})
.on('error', function(e) {
console.log("Can't send response: " + e);
that.ostream.end();
that.ostream.end();
callback();
});
} else {