From 56e7adfe731d887dd4a0295ac9128e7b02018771 Mon Sep 17 00:00:00 2001
From: FORESTIER Fabien <fabien.forestier@soprasteria.com>
Date: Thu, 31 May 2018 09:13:17 +0200
Subject: [PATCH] Use index *.full.v2, change highlighting query

---
 webapp/src/app/geosource/models/elasticsearch-options.model.ts | 2 +-
 webapp/src/app/geosource/services/elasticsearch.service.ts     | 3 ++-
 webapp/src/environments/environment.ts                         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/webapp/src/app/geosource/models/elasticsearch-options.model.ts b/webapp/src/app/geosource/models/elasticsearch-options.model.ts
index 52eb42f7..3690bab8 100644
--- a/webapp/src/app/geosource/models/elasticsearch-options.model.ts
+++ b/webapp/src/app/geosource/models/elasticsearch-options.model.ts
@@ -62,7 +62,7 @@ export class ElasticsearchOptions {
         'label-en': 'Formats',
         'aggregations': [],
         'activeFilters': [],
-        'type': 'number'
+        'type': 'string'
       },
       {
         'field': 'date_publication',
diff --git a/webapp/src/app/geosource/services/elasticsearch.service.ts b/webapp/src/app/geosource/services/elasticsearch.service.ts
index 54a6494a..862804d3 100644
--- a/webapp/src/app/geosource/services/elasticsearch.service.ts
+++ b/webapp/src/app/geosource/services/elasticsearch.service.ts
@@ -120,7 +120,8 @@ export class ElasticsearchService {
               'pre_tags': ['<span class="highlighted">'],
               'post_tags': ['</span>'],
               'require_field_match': false,
-              'type': 'unified',
+              'type': 'fvh',
+              'fragmenter': 'span',
               'order': 'score',
               'fields': {
                 '*': {
diff --git a/webapp/src/environments/environment.ts b/webapp/src/environments/environment.ts
index 45d82e10..3e8e96ee 100644
--- a/webapp/src/environments/environment.ts
+++ b/webapp/src/environments/environment.ts
@@ -7,7 +7,7 @@ export const environment = {
   production: false,
 
   elasticsearchUrl: {
-    full: 'http://localhost:8081/elasticsearch/*.full',
+    full: 'http://localhost:8081/elasticsearch/*.full.v2',
     meta: 'http://localhost:8081/elasticsearch/*.meta'
   },
 
-- 
GitLab