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

Added proper choice for regex support to change node

Browse Source 
(and better error catching)
Addresses Issue #121
This commit is contained in:
Dave C-J 2013-12-24 16:18:18 +00:00
parent 2ba5e0fe3e
commit b7531bae4d
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nodes/core/logic/15-change.html
View File

@ -34,6 +34,11 @@
<label id="node-input-t">replace with</label> <label id="node-input-t">replace with</label>
<input type="text" id="node-input-to" placeholder="that"/> <input type="text" id="node-input-to" placeholder="that"/>
</div> </div>
<div class="form-row" id="node-reg-row">
<label>&nbsp;</label>
<input type="checkbox" id="node-input-reg" style="display: inline-block; width: auto; vertical-align: top;">
<label for="node-input-reg" style="width: 70%;">Use regular expressions ?</label>
</div>
<br/> <br/>
<div class="form-row"> <div class="form-row">
<label for="node-input-name"><i class="icon-tag"></i> Name</label> <label for="node-input-name"><i class="icon-tag"></i> Name</label>
@ -58,6 +63,7 @@
property: {value:"payload"}, property: {value:"payload"},
from: {value:""}, from: {value:""},
to: {value:""}, to: {value:""},
reg: {value:false},
name: {value:""} name: {value:""}
}, },
inputs: 1, inputs: 1,
@ -78,6 +84,7 @@
$("#node-input-t").html("with value"); $("#node-input-t").html("with value");
$("#node-from-row").hide(); $("#node-from-row").hide();
$("#node-to-row").show(); $("#node-to-row").show();
$("#node-reg-row").hide();
$("#node-tip").html("Tip: expects a new property name and either a fixed value OR the full name of another msg.property eg: msg.sentiment.score"); $("#node-tip").html("Tip: expects a new property name and either a fixed value OR the full name of another msg.property eg: msg.sentiment.score");
} }
if (a === "delete") { if (a === "delete") {
@ -86,6 +93,7 @@
//$("#node-input-t").html("to"); //$("#node-input-t").html("to");
$("#node-from-row").hide(); $("#node-from-row").hide();
$("#node-to-row").hide(); $("#node-to-row").hide();
$("#node-reg-row").hide();
$("#node-tip").html("Tip: deletes the named property and all sub-properties"); $("#node-tip").html("Tip: deletes the named property and all sub-properties");
} }
if (a === "change") { if (a === "change") {
@ -94,7 +102,8 @@
$("#node-input-t").html("replace with"); $("#node-input-t").html("replace with");
$("#node-from-row").show(); $("#node-from-row").show();
$("#node-to-row").show(); $("#node-to-row").show();
$("#node-tip").html("Tip: <i>if it contains</i> can be a regex, likewise <i>replace with</i> can accept regex results. Only works on strings."); $("#node-reg-row").show();
$("#node-tip").html("Tip: If <i>contains</i> is a regex, you <b>must</b> escape any special characters. Likewise <i>replace with</i> can accept regex results. Only works on strings.");
} }
//if (a === "replace") { //if (a === "replace") {
// $("#node-input-todo").html("called"); // $("#node-input-todo").html("called");

12
nodes/core/logic/15-change.js
View File

@ -22,6 +22,8 @@ function ChangeNode(n) {
this.property = n.property || ""; this.property = n.property || "";
this.from = n.from || " "; this.from = n.from || " ";
this.to = n.to || " "; this.to = n.to || " ";
this.reg = n.reg;
console.log("Type=",this.reg);
var node = this; var node = this;
var makeNew = function( stem, path, value ) { var makeNew = function( stem, path, value ) {
@ -35,7 +37,15 @@ function ChangeNode(n) {
this.on('input', function (msg) { this.on('input', function (msg) {
if (node.action == "change") { if (node.action == "change") {
node.re = new RegExp(this.from, "g"); if (node.reg === false) {
this.from = this.from.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
}
//console.log("Regex is:",this.from);
try {
node.re = new RegExp(this.from, "g");
} catch (e) {
node.error("Invalid regex: "+this.from);
}
if (typeof msg[node.property] === "string") { if (typeof msg[node.property] === "string") {
msg[node.property] = (msg[node.property]).replace(node.re, node.to); msg[node.property] = (msg[node.property]).replace(node.re, node.to);
} }