From bd4f34000c2c4e8696a38eaed879b21c7cf4563f Mon Sep 17 00:00:00 2001 From: Ulf Bjorkengren Date: Tue, 28 Jan 2025 15:33:22 +0100 Subject: [PATCH] range refactor cleanup Signed-off-by: Ulf Bjorkengren --- server/vissv2server/vissv2server.go | 2 +- utils/grcputils.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/vissv2server/vissv2server.go b/server/vissv2server/vissv2server.go index 71d8038e..c9a2ca42 100644 --- a/server/vissv2server/vissv2server.go +++ b/server/vissv2server/vissv2server.go @@ -573,7 +573,7 @@ func validateData(requestMap map[string]interface{}, searchData []utils.SearchDa if requestMap["filter"] != nil { for i := 0; i < len(filterList); i++ { var paramMap map[string]interface{} - if filterList[i].Type == "range" { //parameter:[{"boundary-op":"a", "boundary": "x", "combination-op":"b"},{"boundary-op":"c", "boundary": "y"}] + if filterList[i].Type == "range" { //parameter:[{"logic-op":"a", "boundary": "x", "combination-op":"b"},{"logic-op":"c", "boundary": "y"}] utils.MapRequest(filterList[i].Parameter, ¶mMap) bVal1, bVal2 := getRangeBoundaries(paramMap) if !utils.IsNumber(bVal1) || (len(bVal2) != 0 && !utils.IsNumber(bVal2)) { // number ok, one or two boundaries diff --git a/utils/grcputils.go b/utils/grcputils.go index 71126d45..aed20855 100644 --- a/utils/grcputils.go +++ b/utils/grcputils.go @@ -380,10 +380,10 @@ func getPbRangeFilterValue(index int, valueMap interface{}) *pb.FilterExpression switch vv := valueMap.(type) { case []interface{}: rangeObject := vv[index].(map[string]interface{}) - protoRangeValue.LogicOperator = rangeObject["boundary-op"].(string) + protoRangeValue.LogicOperator = rangeObject["logic-op"].(string) protoRangeValue.Boundary = rangeObject["boundary"].(string) case map[string]interface{}: - protoRangeValue.LogicOperator = vv["boundary-op"].(string) + protoRangeValue.LogicOperator = vv["logic-op"].(string) protoRangeValue.Boundary = vv["boundary"].(string) default: return nil