diff --git a/module/Oscar/src/Oscar/Strategy/Search/ActivityElasticSearch.php b/module/Oscar/src/Oscar/Strategy/Search/ActivityElasticSearch.php
index e2a14cf55741845657ffa5d2faa7ad8e9413b0c4..69c88e12f106ba0d5a87c3f81c3b8eaaf0c9ab13 100644
--- a/module/Oscar/src/Oscar/Strategy/Search/ActivityElasticSearch.php
+++ b/module/Oscar/src/Oscar/Strategy/Search/ActivityElasticSearch.php
@@ -198,12 +198,13 @@ class ActivityElasticSearch implements ActivitySearchStrategy
'numbers^9',
'oscar^9',
'label^7',
- 'description^7',
+ 'description^2',
'project^5',
'disciplines^5',
'activitytype^2',
'partners^5',
- 'members^5']
+ 'members^5'],
+ "fuzziness"=> "auto"
]
]
]
diff --git a/module/Oscar/src/Oscar/Strategy/Search/OrganizationElasticSearch.php b/module/Oscar/src/Oscar/Strategy/Search/OrganizationElasticSearch.php
index b40e460a62e0d95a8a93b64e3825198086dbdd1c..414a888f005bb9b8490bb39bac957b64ac318439 100644
--- a/module/Oscar/src/Oscar/Strategy/Search/OrganizationElasticSearch.php
+++ b/module/Oscar/src/Oscar/Strategy/Search/OrganizationElasticSearch.php
@@ -191,7 +191,7 @@ class OrganizationElasticSearch implements OrganizationSearchStrategy
'body' => [
'size' => 10000,
"query" => [
- 'query_string' => [
+ 'multi_match' => [
'fields' => [
'code^7',
'shortname^9',
@@ -206,6 +206,7 @@ class OrganizationElasticSearch implements OrganizationSearchStrategy
'persons',
'activities'
],
+ "fuzziness"=> "auto",
'query' => $search,
]
@@ -289,22 +290,22 @@ class OrganizationElasticSearch implements OrganizationSearchStrategy
],
'shortname' => [
'type' => 'text',
- 'analyzer' => 'noaccent'
+// 'analyzer' => 'noaccent'
],
'fullname' => [
- 'analyzer' => 'noaccent',
+// 'analyzer' => 'noaccent',
'type' => 'text',
],
'description' => [
- 'analyzer' => 'noaccent',
+// 'analyzer' => 'noaccent',
'type' => 'text',
],
'email' => [
- 'analyzer' => 'noaccent',
+// 'analyzer' => 'noaccent',
'type' => 'text',
],
'city' => [
- 'analyzer' => 'noaccent',
+// 'analyzer' => 'noaccent',
'type' => 'text',
],
'siret' => [
@@ -320,11 +321,11 @@ class OrganizationElasticSearch implements OrganizationSearchStrategy
'type' => 'keyword',
],
'persons' => [
- 'analyzer' => 'noaccent',
+// 'analyzer' => 'noaccent',
'type' => 'text',
],
'activities' => [
- 'analyzer' => 'noaccent',
+// 'analyzer' => 'noaccent',
'type' => 'text',
],
]
diff --git a/module/Oscar/src/Oscar/Strategy/Search/PersonElasticSearch.php b/module/Oscar/src/Oscar/Strategy/Search/PersonElasticSearch.php
index ecf2bf61056c3c771cab57ea3fc66964155da3f1..efd22fce0c1b44a0d5494b9e65c70bec4e8fb996 100644
--- a/module/Oscar/src/Oscar/Strategy/Search/PersonElasticSearch.php
+++ b/module/Oscar/src/Oscar/Strategy/Search/PersonElasticSearch.php
@@ -91,7 +91,7 @@ class PersonElasticSearch implements PersonSearchStrategy
'body' => [
'size' => 10000,
'query' => [
- 'query_string' => [
+ 'multi_match' => [
'query' => $searchQuery,
'fields' => [
'fullname^4',
@@ -102,23 +102,12 @@ class PersonElasticSearch implements PersonSearchStrategy
'affectation^5',
'organizations^5',
'activities^5',
- 'connectors']
+ 'connectors'
+ ],
+ "fuzziness"=> "auto"
]
]
]
-
-// 'body' => [
-// 'size' => $limit,
-// 'query' => [
-// 'multi_match' => [
-// 'query' => $searchQuery,
-// 'type' => 'phrase_prefix',
-// 'fields' => ['fullname^6','lastname^5', 'firstname^2', 'email', 'affectation^3', 'location^3', 'organizations', 'activities', 'connectors'],
-// /* 'max_expansions' => 20,*/
-// /*'fuzziness' => 1*/
-// ]
-// ]
-// ]
];
$response = $this->getClient()->search($params);