Implemented operator based firiing in backend

2016-11-15 06:35:25 -08:00
parent b2db2b26dd
commit dfb1b1918c
3 changed files with 13 additions and 5 deletions
@@ -32,10 +32,11 @@ func (e *DefaultEvalHandler) Eval(context *EvalContext) {
 			break
 		}

-		// break if result has not triggered yet
-		if cr.Firing == false {
-			firing = false
-			break
+		// calculating Firing based on operator
+		if cr.Operator == "or" {
+			firing = firing || cr.Firing
+		} else {
+			firing = firing && cr.Firing
 		}

 		context.EvalMatches = append(context.EvalMatches, cr.EvalMatches...)