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

Fix wrong number of double quotes in CSV parsing

Browse Source 
to close #1162
This commit is contained in:
Dave Conway-Jones 2017-02-20 22:44:37 +00:00
parent 4794fe495c
commit bfcd795687
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,15 @@ module.exports = function(RED) {
for (var p in msg.payload[0]) { for (var p in msg.payload[0]) {
if (msg.payload[0].hasOwnProperty(p)) { if (msg.payload[0].hasOwnProperty(p)) {
if (typeof msg.payload[0][p] !== "object") { if (typeof msg.payload[0][p] !== "object") {
ou += msg.payload[0][p] + ","; var q = msg.payload[0][p];
if (q.indexOf(node.quo) !== -1) { // add double quotes if any quotes
q = q.replace(/"/g, '""');
ou += node.quo + q + node.quo + node.sep;
}
else if (q.indexOf(node.sep) !== -1) { // add quotes if any "commas"
ou += node.quo + q + node.quo + node.sep;
}
else { ou += q + node.sep; } // otherwise just add
} }
} }
} }
@ -142,7 +150,9 @@ module.exports = function(RED) {
else { else {
if (line[i] === node.quo) { // if it's a quote toggle inside or outside if (line[i] === node.quo) { // if it's a quote toggle inside or outside
f = !f; f = !f;
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) {
if (f === false) { 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) && f) { // 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

9
test/nodes/core/parsers/70-CSV_spec.js
View File

@ -119,7 +119,7 @@ describe('CSV node', function() {
msg.should.have.property('payload', { a: 1, b: -2, c: '+3', d: 4, e: -5, f: 'ab"cd', g: 'with,a,comma' }); msg.should.have.property('payload', { a: 1, b: -2, c: '+3', d: 4, e: -5, f: 'ab"cd', g: 'with,a,comma' });
done(); done();
}); });
var testString = '"1","-2","+3","04","-05",ab""cd,"with,a,comma"'+String.fromCharCode(10); var testString = '"1","-2","+3","04","-05","ab""cd","with,a,comma"'+String.fromCharCode(10);
n1.emit("input", {payload:testString}); n1.emit("input", {payload:testString});
}); });
}); });
@ -132,12 +132,11 @@ describe('CSV node', function() {
var n2 = helper.getNode("n2"); var n2 = helper.getNode("n2");
n2.on("input", function(msg) { n2.on("input", function(msg) {
//console.log(msg); //console.log(msg);
msg.should.have.property('payload', { a: 1, b: -2, c: '+3', d: 4, e: -5, f: 'ab"cd', g: 'with,a,comma' }); msg.should.have.property('payload', { a: "with,an", b: "odd,number", c: "ofquotes" });
//msg.should.have.property('payload', { a: 1, b: -2, c: '+3', d: 4, e: -5, f: 'ab"cd', g: 'with,a,comma' });
done(); done();
}); });
var testString = '"with,a"n,odd",num"ber,of"quotes'+String.fromCharCode(10); var testString = '"with,a"n,odd","num"ber","of"qu"ot"es"'+String.fromCharCode(10);
n1.emit("input", {payload:testString});
testString = '"1","-2","+3","04","-05",ab""cd,"with,a,comma"'+String.fromCharCode(10);
n1.emit("input", {payload:testString}); n1.emit("input", {payload:testString});
}); });
}); });