fix cmp_any #7

Author: oliveagle

jsonpath.go

@@ -526,21 +526,23 @@ func eval_filter(obj, root interface{}, lp, op, rp string) (res bool, err error)
 	}
 }
 
-func isNumber(s string) bool {
-	dot_cnt := 0
-	for _, c := range s {
-		if c == '.' {
-			dot_cnt += 1
-			if dot_cnt > 1 {
-				return false
-			}
-		} else if ( c >= '0' && c <= '9') {
-			continue
+func isNumber(o interface{}) bool {
+	switch v := o.(type) {
+	case int,int8,int16,int32,int64:
+		return true
+	case uint,uint8,uint16,uint32,uint64:
+		return true
+	case float32,float64:
+		return true
+	case string:
+		_, err := strconv.ParseFloat(v, 64)
+		if err == nil {
+			return true
 		} else {
 			return false
 		}
 	}
-	return true
+	return false
 }
 
 func cmp_any(obj1, obj2 interface{}, op string) (bool, error) {
@@ -550,9 +552,8 @@ func cmp_any(obj1, obj2 interface{}, op string) (bool, error) {
 		return false, fmt.Errorf("op should only be <, <=, ==, >= and >")
 	}
 
-
 	var exp string
-	if isNumber(fmt.Sprintf("%s", obj1)) && isNumber(fmt.Sprintf("%s", obj2)) {
+	if isNumber(obj1) && isNumber(obj2) {
 		exp = fmt.Sprintf(`%v %s %v`, obj1, op, obj2)
 	} else {
 		exp = fmt.Sprintf(`"%v" %s "%v"`, obj1, op, obj2)
@@ -569,5 +570,6 @@ func cmp_any(obj1, obj2 interface{}, op string) (bool, error) {
 	if res.Value.String() == "true" {
 		return true, nil
 	}
+
 	return false, nil
 }

jsonpath_test.go

@@ -862,12 +862,18 @@ var tcase_cmp_any = []map[string]interface{}{
 		"op":   "==",
 		"exp":  true,
 		"err": nil,
+	},{
+		"obj1": 20,
+		"obj2": "100",
+		"op": ">",
+		"exp": false,
+		"err": nil,
 	},
 }
 
 func Test_jsonpath_cmp_any(t *testing.T) {
 	for idx, tcase := range tcase_cmp_any {
-		//for idx, tcase := range tcase_cmp_any[6:] {
+		//for idx, tcase := range tcase_cmp_any[8:] {
 		t.Logf("idx: %v, %v %v %v, exp: %v", idx, tcase["obj1"], tcase["op"], tcase["obj2"], tcase["exp"])
 		res, err := cmp_any(tcase["obj1"], tcase["obj2"], tcase["op"].(string))
 		exp := tcase["exp"].(bool)
@@ -956,4 +962,24 @@ func Test_jsonpath_null_in_the_middle(t *testing.T) {
 
 	res, err := JsonPathLookup(j, "$.head_commit.author.username")
 	t.Log(res, err)
+}
+
+func Test_jsonpath_num_cmp(t *testing.T) {
+	data := `{
+	"books": [ 
+                { "name": "My First Book", "price": 10 }, 
+		{ "name": "My Second Book", "price": 20 } 
+		]
+}`
+	var j interface{}
+	json.Unmarshal([]byte(data), &j)
+	res, err := JsonPathLookup(j, "$.books[?(@.price > 100)].name")
+	if err != nil {
+		t.Fatal(err)
+	}
+	arr := res.([]interface{})
+	if len(arr) != 0 {
+		t.Fatal("should return [], got: ", arr)
+	}
+
 }