Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Use CSV stringify to properly escape data in CSV

Browse Source
This commit is contained in:
Patrick Niklaus 2018-04-16 10:04:42 +00:00 committed by Patrick Niklaus
parent 4654751872
commit 29db0c80d9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -44,6 +44,7 @@
"chalk": "^1.1.3", "chalk": "^1.1.3",
"command-line-args": "^5.0.2", "command-line-args": "^5.0.2",
"command-line-usage": "^5.0.4", "command-line-usage": "^5.0.4",
"csv-stringify": "^3.0.0",
"cucumber": "^1.2.1", "cucumber": "^1.2.1",
"d3-queue": "^2.0.3", "d3-queue": "^2.0.3",
"docbox": "^1.0.6", "docbox": "^1.0.6",

10
scripts/osrm-runner.js
View File

@ -10,6 +10,7 @@ const clu = require('command-line-usage');
const ansi = require('ansi-escape-sequences'); const ansi = require('ansi-escape-sequences');
const turf = require('turf'); const turf = require('turf');
const jp = require('jsonpath'); const jp = require('jsonpath');
const csv_stringify = require('csv-stringify/lib/sync');
const run_query = (query_options, filters, callback) => { const run_query = (query_options, filters, callback) => {
let tic = () => 0.; let tic = () => 0.;
@ -123,11 +124,8 @@ queries = queries.map(q => { return {hostname: options.server.hostname, port: op
http.globalAgent.maxSockets = options['max-sockets']; http.globalAgent.maxSockets = options['max-sockets'];
queries.map(query => { queries.map(query => {
run_query(query, options.filter, (query, code, ttfb, total, results) => { run_query(query, options.filter, (query, code, ttfb, total, results) => {
let str = `"${query}",${code}`; let data = results ? JSON.stringify(results[0]) : '';
if (ttfb !== undefined) str += `,${ttfb}`; let record = [[query, code, ttfb, total, data]];
if (total !== undefined) str += `,${total}`; process.stdout.write(csv_stringify(record));
if (typeof results === 'object' && results.length > 0)
str += ',' + results.map(x => isNaN(x) ? '"' + JSON.stringify(x).replace(/\n/g, ';').replace(/"/g, "'") + '"' : Number(x)).join(',');
console.log(str);
}); });
}); });