frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix csv handling of "numbers" with E in...

Browse Source
This commit is contained in:
Dave Conway-Jones 2016-06-14 22:36:44 +01:00
parent 0441c83fd7
commit 9e96eba98f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nodes/core/parsers/70-CSV.js
View File

@ -112,6 +112,7 @@ module.exports = function(RED) {
var first = true; // is this the first line var first = true; // is this the first line
var line = msg.payload; var line = msg.payload;
var tmp = ""; var tmp = "";
var reg = new RegExp("^[-]?[0-9.]+[\.]?[0-9]+$");
// For now we are just going to assume that any \r or \n means an end of line... // For now we are just going to assume that any \r or \n means an end of line...
// got to be a weird csv that has singleton \r \n in it for another reason... // got to be a weird csv that has singleton \r \n in it for another reason...
@ -134,7 +135,7 @@ module.exports = function(RED) {
else if ((line[i] === node.sep) && f) { // if we are outside of quote (ie valid separator else if ((line[i] === node.sep) && f) { // if we are outside of quote (ie valid separator
if (!node.goodtmpl) { node.template[j] = "col"+(j+1); } if (!node.goodtmpl) { node.template[j] = "col"+(j+1); }
if ( node.template[j] && (node.template[j] !== "") && (k[j] !== "" ) ) { if ( node.template[j] && (node.template[j] !== "") && (k[j] !== "" ) ) {
if ( (k[j].charAt(0) !== "+") && !isNaN(Number(k[j])) ) { k[j] = Number(k[j]); } if ( reg.test(k[j]) ) { k[j] = parseFloat(k[j]); }
o[node.template[j]] = k[j]; o[node.template[j]] = k[j];
} }
j += 1; j += 1;
@ -144,7 +145,7 @@ module.exports = function(RED) {
//console.log(j,k,o,k[j]); //console.log(j,k,o,k[j]);
if (!node.goodtmpl) { node.template[j] = "col"+(j+1); } if (!node.goodtmpl) { node.template[j] = "col"+(j+1); }
if ( node.template[j] && (node.template[j] !== "") && (k[j] !== "") ) { if ( node.template[j] && (node.template[j] !== "") && (k[j] !== "") ) {
if ( (k[j].charAt(0) !== "+") && !isNaN(Number(k[j])) ) { k[j] = Number(k[j]); } if ( reg.test(k[j]) ) { k[j] = parseFloat(k[j]); }
else { k[j].replace(/\r$/,''); } else { k[j].replace(/\r$/,''); }
o[node.template[j]] = k[j]; o[node.template[j]] = k[j];
} }
@ -169,7 +170,7 @@ module.exports = function(RED) {
//console.log(j,k,o,k[j]); //console.log(j,k,o,k[j]);
if (!node.goodtmpl) { node.template[j] = "col"+(j+1); } if (!node.goodtmpl) { node.template[j] = "col"+(j+1); }
if ( node.template[j] && (node.template[j] !== "") && (k[j] !== "") ) { if ( node.template[j] && (node.template[j] !== "") && (k[j] !== "") ) {
if ( (k[j].charAt(0) !== "+") && !isNaN(Number(k[j])) ) { k[j] = Number(k[j]); } if ( reg.test(k[j]) ) { k[j] = parseFloat(k[j]); }
else { k[j].replace(/\r$/,''); } else { k[j].replace(/\r$/,''); }
o[node.template[j]] = k[j]; o[node.template[j]] = k[j];
} }