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

let CSV obj->css allow blank columns in template

Browse Source
This commit is contained in:
Dave Conway-Jones 2015-10-15 08:31:42 +01:00
parent 217c9718e4
commit 6ae1a5ba0d
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,25 +69,31 @@ module.exports = function(RED) {
ou += msg.payload[s].join(node.sep) + node.ret; ou += msg.payload[s].join(node.sep) + node.ret;
} }
else { else {
if (node.template[0] !== '') { if ((node.template.length === 1) && (node.template[0] === '')) {
node.warn(RED._("csv.errors.obj_csv"));
}
else {
for (var t=0; t < node.template.length; t++) { for (var t=0; t < node.template.length; t++) {
if (node.template[t] === '') {
// aaargh - resorting to eval here - but fairly contained front and back. ou += node.sep;
var p = RED.util.ensureString(eval("msg.payload[s]."+node.template[t]));
if (p === "undefined") { p = ""; }
if (p.indexOf(node.quo) !== -1) { // add double quotes if any quotes
p = p.replace(/"/g, '""');
ou += node.quo + p + node.quo + node.sep;
} }
else if (p.indexOf(node.sep) !== -1) { // add quotes if any "commas" else {
ou += node.quo + p + node.quo + node.sep; // aaargh - resorting to eval here - but fairly contained front and back.
var p = RED.util.ensureString(eval("msg.payload[s]."+node.template[t]));
if (p === "undefined") { p = ""; }
if (p.indexOf(node.quo) !== -1) { // add double quotes if any quotes
p = p.replace(/"/g, '""');
ou += node.quo + p + node.quo + node.sep;
}
else if (p.indexOf(node.sep) !== -1) { // add quotes if any "commas"
ou += node.quo + p + node.quo + node.sep;
}
else { ou += p + node.sep; } // otherwise just add
} }
else { ou += p + node.sep; } // otherwise just add
} }
ou = ou.slice(0,-1) + node.ret; // remove final "comma" and add "newline" ou = ou.slice(0,-1) + node.ret; // remove final "comma" and add "newline"
} }
else { node.warn(RED._("csv.errors.obj_csv")); }
} }
} }
msg.payload = ou; msg.payload = ou;