From c6b56207dd3a913c6c37a50c1e54f6076c10c8e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reinhard=20X=2E=20F=C3=BCrst?= Date: Tue, 21 Nov 2023 21:07:47 +0000 Subject: [PATCH] return csv string --- .vscode/launch.json | 2 +- routes/index.js | 2 +- sensorspecials/noise.js | 40 ++++++++++++++++++++++------------------ 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 5e20a8e..36fc1dd 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -18,7 +18,7 @@ "MONGOHOST": "192.168.178.190", "MONGOAUTH": "true", "MONGOUSRP": "admin:mongo4noise", - "DBASE": "influx" +// "DBASE": "influx" } }, { diff --git a/routes/index.js b/routes/index.js index 7c3ad01..edec9e8 100644 --- a/routes/index.js +++ b/routes/index.js @@ -6,7 +6,7 @@ const router = express.Router(); /* GET home page. */ router.get('/', function(req, res, next) { - res.status(200).json({message: trans('NOTHIMG')}) + res.status(200).json({message: trans('NOTHING')}) }); export default router diff --git a/sensorspecials/noise.js b/sensorspecials/noise.js index c6257c6..638e91f 100644 --- a/sensorspecials/noise.js +++ b/sensorspecials/noise.js @@ -36,24 +36,28 @@ export const getNoiseData = async (params, possibles, props) => { opts.start = start opts.stop = stop let erg = await x.func(opts) // get the data - ret = { - err: erg.err, - options: { - sid: opts.sensorid, - indoor: props.location[0].indoor, - span: opts.span, - start: DateTime.fromISO(opts.start.slice(7)).toUTC().toISO(), - data: opts.data, - peak: opts.peak, - count: erg.values.length, - }, - values: erg.values, - } - if (!x.peak) { - delete ret.options.peak - } - if(ret.values.length === 0) { - ret.err = trans('NODATA') + if (opts.csv === true) { + ret = erg + } else { + ret = { + err: erg.err, + options: { + sid: opts.sensorid, + indoor: props.location[0].indoor, + span: opts.span, + start: DateTime.fromISO(opts.start.slice(7)).toUTC().toISO(), + data: opts.data, + peak: opts.peak, + count: erg.values.length, + }, + values: erg.values, + } + if (!x.peak) { + delete ret.options.peak + } + if(ret.values.length === 0) { + ret.err = trans('NODATA') + } } return ret }