|
@@ -318,7 +318,8 @@ func getSearchQuery(keyword, industry, minprice, maxprice, findfields, mustquery
|
|
|
//match_phrase := `{"match_phrase": {"s_subscopeclass": "%s"}}`
|
|
|
query := `{"query":{"bool":{"must":[%s],"should":[%s],"minimum_should_match": %d}}}`
|
|
|
query_bool_should := `{"bool":{"should":[%s],"minimum_should_match": 1}}`
|
|
|
- query_bools_must := `{"bool":{"must":[{"range":{"bidamount":{%s}}}],"must_not":[{"term":{"bidamount":0}},{"term":{"budget":0}}]}},{"bool":{"must":[{"term":{"bidamount":0}},{"range":{"budget":{%s}}}]}},{"bool":{"must":[{"term":{"budget":0}},{"range":{"bidamount":{%s}}}]}}`
|
|
|
+ //query_bools_must := `{"bool":{"must":[{"range":{"bidamount":{%s}}}],"must_not":[{"term":{"bidamount":0}},{"term":{"budget":0}}]}},{"bool":{"must":[{"term":{"bidamount":0}},{"range":{"budget":{%s}}}]}},{"bool":{"must":[{"term":{"budget":0}},{"range":{"bidamount":{%s}}}]}}`
|
|
|
+ query_bools_must := `{"bool":{"must":[{"range":{"bidamount":{%s}}}]}},{"bool":{"must":[{"range":{"budget":{%s}}}],"must_not":[{"range":{"bidamount":{"gte":-1}}}]}}`
|
|
|
query_bool_must := `{"bool":{"must":[{"terms":{"s_subscopeclass":[%s]}}]}}`
|
|
|
//rge := `{"range": {"bidamount": {%s}}},{"range": {"budget": {%s}}}`
|
|
|
gte := `"gte": %s`
|
|
@@ -361,7 +362,7 @@ func getSearchQuery(keyword, industry, minprice, maxprice, findfields, mustquery
|
|
|
if maxprice != "" {
|
|
|
sq += fmt.Sprintf(lte, maxprice)
|
|
|
}
|
|
|
- query_price := fmt.Sprintf(query_bool_should, fmt.Sprintf(query_bools_must, sq, sq, sq))
|
|
|
+ query_price := fmt.Sprintf(query_bool_should, fmt.Sprintf(query_bools_must, sq, sq))
|
|
|
bools = append(bools, query_price)
|
|
|
}
|
|
|
qstr = fmt.Sprintf(query, mustquery, strings.Join(bools, ","), len(bools))
|