Added or node (#123)

go_EMS/datatypes/taggermomimpl.go

@@ -13,6 +13,15 @@ func (andNode AndNode) Eval(payload map[string]interface{}) bool {
     return true
 }
 
+func (orNode OrNode) Eval(payload map[string]interface{}) bool {
+    for _,node := range orNode.Members {
+        if node.Eval(payload) {
+            return true
+        }
+    }
+    return false
+}
+
 func (pathfunNode PathFunNode) Eval(payload map[string]interface{}) bool {
     theVal, err := extractFromMap(payload, pathfunNode.Path)
     if err != nil {

go_EMS/eventproc/tagnodebuilder.go

@@ -16,7 +16,7 @@ func getNodeFromFilter(thejson map[string]interface{}) (dt.TagNode,error) {
     case "AND":
         return getAndNode(thejson)
     case "OR":
-        //return getOrNode(thejson)
+        return getOrNode(thejson)
     case "PATHFUN":
         return getPathFunNode(thejson)
     }
@@ -40,6 +40,23 @@ func getAndNode(thejson map[string]interface{}) (dt.TagNode,error) {
     return dt.AndNode{memberNodes},nil
 }
 
+func getOrNode(thejson map[string]interface{}) (dt.TagNode,error) {
+    members, ok := thejson["members"].([]map[string]interface{})
+    if !ok {
+        err := errors.New("No valid field 'members' in OR node definition")
+        return nil,err
+    }
+    memberNodes := make([]dt.TagNode, len(members))
+    for i,member := range members {
+        memberNode, err := getNodeFromFilter(member)
+        if err!=nil {
+            return nil, err
+        }
+        memberNodes[i] = memberNode
+    }
+    return dt.OrNode{memberNodes},nil
+}
+
 func getPathFunNode(thejson map[string]interface{}) (dt.TagNode,error) {
     funName, ok := thejson["function"].(string)
     if !ok {