From 2c1a169be0171af20d3c7b599717a2a717f6324c Mon Sep 17 00:00:00 2001 From: ti-lap-563 Date: Thu, 27 Oct 2022 11:37:20 +0530 Subject: [PATCH 1/4] Changes by chandni --- .../java/org/sunbird/search/processor/SearchProcessor.java | 5 ++--- search-api/search-service/conf/application.conf | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java b/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java index 5d163638d..014071e49 100644 --- a/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java +++ b/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java @@ -935,8 +935,7 @@ private QueryBuilder getSearchQuery(SearchDTO searchDTO) { } private QueryBuilder getQuery(SearchDTO searchDTO) { - return searchDTO.isFuzzySearch() ? prepareFilteredSearchQuery(searchDTO) : prepareSearchQuery(searchDTO); +// return searchDTO.isFuzzySearch() ? prepareFilteredSearchQuery(searchDTO) : prepareSearchQuery(searchDTO); + return searchDTO.isFuzzySearch() ? (prepareSearchQuery(searchDTO) == null ? prepareFilteredSearchQuery(searchDTO) : prepareSearchQuery(searchDTO)) : prepareSearchQuery(searchDTO); } - - } \ No newline at end of file diff --git a/search-api/search-service/conf/application.conf b/search-api/search-service/conf/application.conf index a803688db..6f4e0f91a 100644 --- a/search-api/search-service/conf/application.conf +++ b/search-api/search-service/conf/application.conf @@ -293,7 +293,8 @@ search.config.path=/home/learning/platform/search cache.type="redis" search.es_conn_info="localhost:9200" -search.fields.query=["name^100","title^100","lemma^100","code^100","domain","subject","description^10","keywords^100","ageGroup^10","filter^10","theme^10","genre^10","objects^25","contentType^100","language^200","teachingMode^25","skills^10","learningObjective^10","curriculum^100","gradeLevel^100","developer^100","attributions^10","identifier^100","IL_UNIQUE_ID^100","owner^50","board^100","relatedBoards^100","creator^100", "dialcodes^100","text","words","releaseNotes"] +#search.fields.query=["name^100","title^100","lemma^100","code^100","domain","subject","description^10","keywords^100","ageGroup^10","filter^10","theme^10","genre^10","objects^25","contentType^100","language^200","teachingMode^25","skills^10","learningObjective^10","curriculum^100","gradeLevel^100","developer^100","attributions^10","identifier^100","IL_UNIQUE_ID^100","owner^50","board^100","relatedBoards^100","creator^100", "dialcodes^100","text","words","releaseNotes"] +search.fields.query=["name^100.0","keywords^60.0","competencies_v3.name^60.0","systemTopics^60","purpose^60","source^50.0","description^5.0","language^5.0"] search.fields.date=["lastUpdatedOn","createdOn","versionDate","lastSubmittedOn","lastPublishedOn"] search.fields.mode_collection=["identifier","name","objectType","contentType","mimeType","size","childNodes","board","subject","medium","gradeLevel","appIcon", "origin", "originData"] search.batch.size=500 From bef17d7c162fe6b115616a4618cfca5863506a22 Mon Sep 17 00:00:00 2001 From: ti-lap-563 Date: Wed, 9 Nov 2022 14:38:46 +0530 Subject: [PATCH 2/4] Changes for course search api --- .../main/java/org/sunbird/search/processor/SearchProcessor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java b/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java index 014071e49..1410c88ff 100644 --- a/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java +++ b/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java @@ -937,5 +937,6 @@ private QueryBuilder getSearchQuery(SearchDTO searchDTO) { private QueryBuilder getQuery(SearchDTO searchDTO) { // return searchDTO.isFuzzySearch() ? prepareFilteredSearchQuery(searchDTO) : prepareSearchQuery(searchDTO); return searchDTO.isFuzzySearch() ? (prepareSearchQuery(searchDTO) == null ? prepareFilteredSearchQuery(searchDTO) : prepareSearchQuery(searchDTO)) : prepareSearchQuery(searchDTO); + } } \ No newline at end of file From 0e345d5f9b93720f03efe21d2d1f80cb46abbf2f Mon Sep 17 00:00:00 2001 From: ti-lap-563 Date: Wed, 9 Nov 2022 14:38:46 +0530 Subject: [PATCH 3/4] course search api changes --- .../main/java/org/sunbird/search/processor/SearchProcessor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java b/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java index 014071e49..1410c88ff 100644 --- a/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java +++ b/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java @@ -937,5 +937,6 @@ private QueryBuilder getSearchQuery(SearchDTO searchDTO) { private QueryBuilder getQuery(SearchDTO searchDTO) { // return searchDTO.isFuzzySearch() ? prepareFilteredSearchQuery(searchDTO) : prepareSearchQuery(searchDTO); return searchDTO.isFuzzySearch() ? (prepareSearchQuery(searchDTO) == null ? prepareFilteredSearchQuery(searchDTO) : prepareSearchQuery(searchDTO)) : prepareSearchQuery(searchDTO); + } } \ No newline at end of file From 08da9aaf0d1eb88bc690a58d8eb24c32da293852 Mon Sep 17 00:00:00 2001 From: ti-lap-563 Date: Wed, 9 Nov 2022 15:28:46 +0530 Subject: [PATCH 4/4] Changes for course search api --- .../main/java/org/sunbird/search/processor/SearchProcessor.java | 2 -- search-api/search-service/conf/application.conf | 1 - 2 files changed, 3 deletions(-) diff --git a/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java b/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java index 1410c88ff..7177116fe 100644 --- a/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java +++ b/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java @@ -935,8 +935,6 @@ private QueryBuilder getSearchQuery(SearchDTO searchDTO) { } private QueryBuilder getQuery(SearchDTO searchDTO) { -// return searchDTO.isFuzzySearch() ? prepareFilteredSearchQuery(searchDTO) : prepareSearchQuery(searchDTO); return searchDTO.isFuzzySearch() ? (prepareSearchQuery(searchDTO) == null ? prepareFilteredSearchQuery(searchDTO) : prepareSearchQuery(searchDTO)) : prepareSearchQuery(searchDTO); - } } \ No newline at end of file diff --git a/search-api/search-service/conf/application.conf b/search-api/search-service/conf/application.conf index 6f4e0f91a..63dd77bd9 100644 --- a/search-api/search-service/conf/application.conf +++ b/search-api/search-service/conf/application.conf @@ -293,7 +293,6 @@ search.config.path=/home/learning/platform/search cache.type="redis" search.es_conn_info="localhost:9200" -#search.fields.query=["name^100","title^100","lemma^100","code^100","domain","subject","description^10","keywords^100","ageGroup^10","filter^10","theme^10","genre^10","objects^25","contentType^100","language^200","teachingMode^25","skills^10","learningObjective^10","curriculum^100","gradeLevel^100","developer^100","attributions^10","identifier^100","IL_UNIQUE_ID^100","owner^50","board^100","relatedBoards^100","creator^100", "dialcodes^100","text","words","releaseNotes"] search.fields.query=["name^100.0","keywords^60.0","competencies_v3.name^60.0","systemTopics^60","purpose^60","source^50.0","description^5.0","language^5.0"] search.fields.date=["lastUpdatedOn","createdOn","versionDate","lastSubmittedOn","lastPublishedOn"] search.fields.mode_collection=["identifier","name","objectType","contentType","mimeType","size","childNodes","board","subject","medium","gradeLevel","appIcon", "origin", "originData"]