1 files changed, 44 insertions, 24 deletions

diff --git a/internal/mapr/whereclause.go b/internal/mapr/whereclause.go
index cc1c164..617aa79 100644
--- a/internal/mapr/whereclause.go
+++ b/internal/mapr/whereclause.go
@@ -3,44 +3,45 @@ package mapr
 import (
 	"strconv"
 
-	"github.com/mimecast/dtail/internal/io/logger"
+	"github.com/mimecast/dtail/internal/io/dlog"
 )
 
 // WhereClause interprets the where clause of the mapreduce query.
 func (q *Query) WhereClause(fields map[string]string) bool {
 	for _, wc := range q.Where {
-		var ok bool
-
 		if wc.Operation > FloatOperation {
-			var lValue, rValue float64
-			if lValue, ok = whereClauseFloatValue(fields, wc.lString, wc.lFloat, wc.lType); !ok {
-				return false
-			}
-			if rValue, ok = whereClauseFloatValue(fields, wc.rString, wc.rFloat, wc.rType); !ok {
-				return false
-			}
-			if ok = wc.floatClause(lValue, rValue); !ok {
+			if !whereClauseFloatValues(fields, wc) {
 				return false
 			}
 			continue
 		}
-
-		var lValue, rValue string
-		if lValue, ok = whereClauseStringValue(fields, wc.lString, wc.lType); !ok {
-			return false
-		}
-		if rValue, ok = whereClauseStringValue(fields, wc.rString, wc.rType); !ok {
-			return false
-		}
-		if ok = wc.stringClause(lValue, rValue); !ok {
+		if !whereClauseStringValues(fields, wc) {
 			return false
 		}
 	}
+	return true
+}
+
+func whereClauseFloatValues(fields map[string]string, wc whereCondition) bool {
+	var lValue, rValue float64
+	var ok bool
+
+	if lValue, ok = whereClauseFloatValue(fields, wc.lString, wc.lFloat, wc.lType); !ok {
+		return false
+	}
+	if rValue, ok = whereClauseFloatValue(fields, wc.rString, wc.rFloat, wc.rType); !ok {
+		return false
+	}
+	if ok = wc.floatClause(lValue, rValue); !ok {
+		return false
+	}
 
 	return true
 }
 
-func whereClauseFloatValue(fields map[string]string, str string, float float64, t fieldType) (float64, bool) {
+func whereClauseFloatValue(fields map[string]string, str string, float float64,
+	t fieldType) (float64, bool) {
+
 	switch t {
 	case Float:
 		return float, true
@@ -55,12 +56,31 @@ func whereClauseFloatValue(fields map[string]string, str string, float float64,
 		}
 		return f, true
 	default:
-		logger.Error("Unexpected argument in 'where' clause", str, float, t)
+		dlog.Common.Error("Unexpected argument in 'where' clause", str, float, t)
 		return 0, false
 	}
 }
 
-func whereClauseStringValue(fields map[string]string, str string, t fieldType) (string, bool) {
+func whereClauseStringValues(fields map[string]string, wc whereCondition) bool {
+	var lValue, rValue string
+	var ok bool
+
+	if lValue, ok = whereClauseStringValue(fields, wc.lString, wc.lType); !ok {
+		return false
+	}
+	if rValue, ok = whereClauseStringValue(fields, wc.rString, wc.rType); !ok {
+		return false
+	}
+	if ok = wc.stringClause(lValue, rValue); !ok {
+		return false
+	}
+
+	return true
+}
+
+func whereClauseStringValue(fields map[string]string, str string,
+	t fieldType) (string, bool) {
+
 	switch t {
 	case Field:
 		value, ok := fields[str]
@@ -71,7 +91,7 @@ func whereClauseStringValue(fields map[string]string, str string, t fieldType) (
 	case String:
 		return str, true
 	default:
-		logger.Error("Unexpected argument in 'where' clause", str, t)
+		dlog.Common.Error("Unexpected argument in 'where' clause", str, t)
 		return str, false
 	}
 }