frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Fixed better handling of odd quotes in CSV node

Browse Source 
(and a better commit message)
This commit is contained in:
Dave Conway-Jones 2016-07-05 11:31:25 +01:00
parent d7943aab28
commit 82269462a4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,7 @@ module.exports = function(RED) {
if (line[i-1] === node.quo) { k[j] += '\"'; } // if it's a quotequote then it's actually a quote if (line[i-1] === node.quo) { k[j] += '\"'; } // if it's a quotequote then it's actually a quote
//if ((line[i-1] !== node.sep) && (line[i+1] !== node.sep)) { k[j] += line[i]; } //if ((line[i-1] !== node.sep) && (line[i+1] !== node.sep)) { k[j] += line[i]; }
} }
else if ((line[i] === node.sep)) { // if it is the end of the line then finish else if ((line[i] === node.sep) && f) { // if it is the end of the line then finish
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 ( reg.test(k[j]) ) { k[j] = parseFloat(k[j]); } if ( reg.test(k[j]) ) { k[j] = parseFloat(k[j]); }
@ -140,9 +140,8 @@ module.exports = function(RED) {
} }
j += 1; j += 1;
k[j] = ""; k[j] = "";
f = true; // reset in/out flag ready for next line.
} }
else if (f && ((line[i] === "\n") || (line[i] === "\r"))) { // handle multiple lines else if ((line[i] === "\n") || (line[i] === "\r")) { // handle multiple lines
//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] !== "") ) {
@ -161,6 +160,7 @@ module.exports = function(RED) {
j = 0; j = 0;
k = [""]; k = [""];
o = {}; o = {};
f = true; // reset in/out flag ready for next line.
} }
else { // just add to the part of the message else { // just add to the part of the message
k[j] += line[i]; k[j] += line[i];