Skip to content

added the fix for fuzzy search #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juhiagl8 wants to merge 1 commit into
base: release-4.10.0
Choose a base branch
from
Open

added the fix for fuzzy search #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ private QueryBuilder prepareSearchQuery(SearchDTO searchDTO) {
if (propertyName.equals("*")) {
relevanceSort = true;
propertyName = "all_fields";
queryBuilder = getAllFieldsPropertyQuery(values);
queryBuilder = getAllFieldsPropertyQuery(values, searchDTO.isFuzzySearch());
boolQuery.must(queryBuilder);
continue;
}
Expand Down Expand Up @@ -463,7 +463,7 @@ private QueryBuilder prepareFilteredSearchQuery(SearchDTO searchDTO) {
relevanceSort = true;
propertyName = "all_fields";
filterFunctionBuilder
.add(new FilterFunctionBuilder(getAllFieldsPropertyQuery(values),
.add(new FilterFunctionBuilder(getAllFieldsPropertyQuery(values, Boolean.FALSE),
ScoreFunctionBuilders.weightFactorFunction(weightages.get("default_weightage"))));
continue;
}
Expand Down Expand Up @@ -597,7 +597,7 @@ private float getweight(List<String> querySearchFeilds, String propertyName) {
* @param values
* @return
*/
private QueryBuilder getAllFieldsPropertyQuery(List<Object> values) {
private QueryBuilder getAllFieldsPropertyQuery(List<Object> values, Boolean fuzzy) {
List<String> queryFields = ElasticSearchUtil.getQuerySearchFields();
Map<String, Float> queryFieldsMap = new HashMap<>();
for (String field : queryFields) {
Expand All @@ -608,9 +608,15 @@ private QueryBuilder getAllFieldsPropertyQuery(List<Object> values) {
}
BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
for (Object value : values) {
queryBuilder
.should(QueryBuilders.multiMatchQuery(value).fields(queryFieldsMap)
.operator(Operator.AND).type(Type.CROSS_FIELDS).lenient(true));
if (fuzzy) {
queryBuilder
.should(QueryBuilders.multiMatchQuery(value).fields(queryFieldsMap)
.operator(Operator.AND).fuzziness("AUTO").lenient(true));
} else {
queryBuilder
.should(QueryBuilders.multiMatchQuery(value).fields(queryFieldsMap)
.operator(Operator.AND).type(Type.CROSS_FIELDS).fuzzyTranspositions(false).lenient(true));
}
}

return queryBuilder;
Expand Down Expand Up @@ -769,10 +775,10 @@ private QueryBuilder getMustTermQuery(String propertyName, List<Object> values,
for (Object value : values) {
if (match) {
queryBuilder.should(
QueryBuilders.matchQuery(propertyName, value));
QueryBuilders.matchQuery(propertyName, value).fuzzyTranspositions(false));
} else {
queryBuilder.mustNot(
QueryBuilders.matchQuery(propertyName, value));
QueryBuilders.matchQuery(propertyName, value).fuzzyTranspositions(false));
}
}

Expand Down Expand Up @@ -935,7 +941,7 @@ private QueryBuilder getSearchQuery(SearchDTO searchDTO) {
}

private QueryBuilder getQuery(SearchDTO searchDTO) {
return searchDTO.isFuzzySearch() ? prepareFilteredSearchQuery(searchDTO) : prepareSearchQuery(searchDTO);
return prepareSearchQuery(searchDTO);
}


Expand Down