From 7245dac1ca912a170c2d213af65032490e0d6669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 12 Jan 2018 16:27:09 +0100 Subject: [PATCH] Elastic: reverted previous two commits The ngrams cause too much noise in the search results. --- pillar/api/search/documents.py | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pillar/api/search/documents.py b/pillar/api/search/documents.py index 9bad4626..612667cb 100644 --- a/pillar/api/search/documents.py +++ b/pillar/api/search/documents.py @@ -24,39 +24,26 @@ edge_ngram_filter = analysis.token_filter( max_gram=15 ) -ngram_filter = analysis.token_filter( - 'ngram_filter', - type='ngram', - min_gram=3, - max_gram=3, -) - autocomplete = es.analyzer( 'autocomplete', tokenizer='standard', filter=['standard', 'asciifolding', 'lowercase', edge_ngram_filter] ) -all_gram = es.analyzer( - 'autocomplete', - tokenizer='standard', - filter=['standard', 'asciifolding', 'lowercase', ngram_filter, edge_ngram_filter] -) - class User(es.DocType): """Elastic document describing user.""" objectID = es.Keyword() - username = es.Text(fielddata=True, analyzer=all_gram) + username = es.Text(fielddata=True, analyzer=autocomplete) username_exact = es.Keyword() - full_name = es.Text(fielddata=True, analyzer=all_gram) + full_name = es.Text(fielddata=True, analyzer=autocomplete) roles = es.Keyword(multi=True) groups = es.Keyword(multi=True) - email = es.Text(fielddata=True, analyzer=all_gram) + email = es.Text(fielddata=True, analyzer=autocomplete) email_exact = es.Keyword() class Meta: