Add "otherwise" option to switch node - also added ability to stop checking after first match or keep matching (as-is today). Fixes Issue #88

nodes/core/logic/10-switch.html

@@ -29,7 +29,12 @@
         </div>
         <a href="#" class="btn btn-mini" id="node-input-add-rule" style="margin-top: 4px;"><i class="icon-plus"></i> Add</a>
     </div>
-    
+    <div>
+        <select id="node-input-checkall" style="width:100%; margin-right:5px;">
+            <option value="true">checking all rules</option>
+            <option value="false">stopping after first match</option>
+        </select>
+    </div>
 </script>
 
 <script type="text/x-red" data-help-name="switch">
@@ -37,6 +42,7 @@
     <p>When a message arrives, the selected property is evaluated against each
     of the defined rules. The message is then sent to the output of <i>all</i>
     rules that pass.</p>
+    <p>Note: the <i>otherwise</i> rule applies as a "not any of" the rules preceeding it.</p>
 </script>
 
 <script type="text/javascript">
@@ -47,6 +53,7 @@
             name: {value:""},
             property: {value:"payload", required:true},
             rules: {value:[{t:"eq", v:""}]},
+            checkall: {value:"true", required:true},
             outputs: {value:1}
         },
         inputs: 1,
@@ -70,7 +77,8 @@
                 {v:"true",t:"is true"},
                 {v:"false",t:"is false"},
                 {v:"null",t:"is null"},
-                {v:"nnull",t:"is not null"}
+                {v:"nnull",t:"is not null"},
+                {v:"else",t:"otherwise"}
             ];
 
             function generateRule(i,rule) {
@@ -84,13 +92,11 @@
                 }
 
                 var valueField = $('<input/>',{class:"node-input-rule-value",type:"text",style:"margin-left: 5px; width: 145px;"}).appendTo(row);
-                
                 var btwnField = $('<span/>').appendTo(row);
                 var btwnValueField = $('<input/>',{class:"node-input-rule-btwn-value",type:"text",style:"margin-left: 5px; width: 50px;"}).appendTo(btwnField);
                 btwnField.append(" and ");
                 var btwnValue2Field = $('<input/>',{class:"node-input-rule-btwn-value2",type:"text",style:"width: 50px;margin-left:2px;"}).appendTo(btwnField);
 
-                 
                 var finalspan = $('<span/>',{style:"float: right; margin-top: 3px;margin-right: 10px;"}).appendTo(row);
                 finalspan.append(' send to <span class="node-input-rule-index">'+i+'</span> ');
 
@@ -108,7 +114,7 @@
                         btwnField.show();
                     } else {
                         btwnField.hide();
-                        if (type === "true" || type === "false" || type === "null" || type === "nnull") {
+                        if (type === "true" || type === "false" || type === "null" || type === "nnull" || type === "else") {
                             valueField.hide();
                         } else {
                             valueField.show();
@@ -140,13 +146,11 @@
                     valueField.val(rule.v);
                 }
                 selectField.change();
-                
             }
 
             $("#node-input-add-rule").click(function() {
                 generateRule($("#node-input-rule-container").children().length+1,{t:"",v:"",v2:""});
                 $("#node-input-rule-container-div").scrollTop($("#node-input-rule-container-div").get(0).scrollHeight);
-                
             });
 
             for (var i=0;i<this.rules.length;i++) {
@@ -172,15 +176,13 @@
         oneditsave: function() {
             var rules = $("#node-input-rule-container").children();
             var ruleset;
-            
             var node = this;
             node.rules= [];
-            
             rules.each(function(i) {
                 var rule = $(this);
                 var type = rule.find("select option:selected").val();
                 var r = {t:type};
-                if (!(type === "true" || type === "false" || type === "null" || type === "nnull")) {
+                if (!(type === "true" || type === "false" || type === "null" || type === "nnull" || type === "else")) {
                     if (type === "btwn") {
                         r.v = rule.find(".node-input-rule-btwn-value").val();
                         r.v2 = rule.find(".node-input-rule-btwn-value2").val();
@@ -189,11 +191,8 @@
                     }
                 }
                 node.rules.push(r);
-                
             });
-            
             node.outputs = node.rules.length;
-        
         }
     });
 </script>

nodes/core/logic/10-switch.js

@@ -29,29 +29,32 @@ var operators = {
     'true': function(a) { return a === true; },
     'false': function(a) { return a === false; },
     'null': function(a) { return a === null; },
-    'nnull': function(a) { return a !== null; }
+    'nnull': function(a) { return a !== null; },
+    'else': function(a) { return a === true; }
 };
 
-
 function SwitchNode(n) {
     RED.nodes.createNode(this, n);
-	
     this.rules = n.rules;
     this.property = n.property;
-	
+    this.checkall = n.checkall || "true";
-	var propertyParts = n.property.split(".");
+    var propertyParts = n.property.split("."),
-	
+        node = this;
-	var node = this;
 
     this.on('input', function (msg) {
         var onward = [];
         var prop = propertyParts.reduce(function (obj, i) {
             return obj[i]
         }, msg);
+        var elseflag = true;
         for (var i=0; i<node.rules.length; i+=1) {
             var rule = node.rules[i];
-	          if (operators[rule.t](prop,rule.v,rule.v2)) {
+            var test = prop;
+            if (rule.t == "else") { test = elseflag; elseflag = true; }
+            if (operators[rule.t](test,rule.v, rule.v2)) {
                 onward.push(msg);
+                elseflag = false;
+                if (node.checkall == "false") { break; }
             } else {
                 onward.push(null);
             }
@@ -59,6 +62,4 @@ function SwitchNode(n) {
         this.send(onward);
     });
 }
-
 RED.nodes.registerType("switch", SwitchNode);
-