pub-solar/obs-portal
5
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat: autodetect "$ as newlines" hack in both OBSVER1 and OBSVER2

Browse source
This commit is contained in:
Paul Bienkowski 2020-11-18 22:13:00 +01:00
parent f013ab4263
commit 0b830601f5
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
logic/tracks.js
View file

@ -11,7 +11,18 @@ function _parseFloat(token) {
return f; return f;
} }
function replaceDollarNewlinesHack(body) {
// see if we are using the hack with $ as newlines, replace them for the csv parser
if (body.endsWith('$')) {
return body.replace(/\$/g, '\n');
}
return body;
}
function addPointsToTrack(trackInfo, body, format = null) { function addPointsToTrack(trackInfo, body, format = null) {
body = replaceDollarNewlinesHack(body);
const detectedFormat = format != null ? format : detectFormat(body); const detectedFormat = format != null ? format : detectFormat(body);
let parser; let parser;
@ -60,10 +71,6 @@ function detectFormat(body) {
} }
function* parseObsver1(body) { function* parseObsver1(body) {
if (body.indexOf('\n') < body.length - 1) {
body = body.replace(/\$/g, '\n');
}
for (const record of csvParse(body, { for (const record of csvParse(body, {
delimiter: ';', delimiter: ';',
encoding: 'utf8', encoding: 'utf8',