Revert "Merge pull request #1698 from libris/feature/lws-424-improve-spelling-suggestions"

This reverts commit e8c8b8f, reversing
changes made to 4dda2ba.

Author: andersju

librisxl-tools/elasticsearch/libris_config.json

@@ -265,6 +265,14 @@
                             "keyword": {
                                 "type": "keyword",
                                 "normalizer": "custom_case_insensitive"
+                            },
+                            "trigram": {
+                                "type": "text",
+                                "analyzer": "trigram"
+                            },
+                            "reverse": {
+                                "type": "text",
+                                "analyzer": "reverse"
                             }
                         }
                     },
@@ -475,35 +483,9 @@
                     }
                 }
             },
-            {
-                "chipStr-spell-and-ignore-length_template": {
-                    "match": "_chipStr",
-                    "mapping": {
-                        "fields": {
-                            "exact": {
-                                "type": "text",
-                                "analyzer": "standard",
-                                "similarity": "bm25-only-idf-ignore-tf"
-                            },
-                            "trigram": {
-                                "type": "text",
-                                "analyzer": "trigram"
-                            },
-                            "reverse": {
-                                "type": "text",
-                                "analyzer": "reverse"
-                            }
-                        },
-                        "analyzer": "softmatcher",
-                        "similarity": "bm25-only-idf-ignore-tf",
-                        "type": "text",
-                        "index": true
-                    }
-                }
-            },
             {
                 "str-ignore-length_template": {
-                    "match": ["_cardStr", "_searchCardStr"],
+                    "match": ["_chipStr", "_cardStr", "_searchCardStr"],
                     "mapping": {
                         "fields": {
                             "exact": {

whelk-core/src/main/groovy/whelk/search/ESQuery.groovy

@@ -49,8 +49,8 @@ class ESQuery {
     private static final String FILTERED_AGG_NAME = 'a'
     private static final String NESTED_AGG_NAME = 'n'
 
-    private static final String SPELL_CHECK_FIELD = '_chipStr.trigram'
-    private static final String SPELL_CHECK_FIELD_REVERSE = '_chipStr.reverse'
+    private static final String SPELL_CHECK_FIELD = '_sortKeyByLang.sv.trigram'
+    private static final String SPELL_CHECK_FIELD_REVERSE = '_sortKeyByLang.sv.reverse'
 
     private static final Map recordsOverCacheRecordsBoost = [
             'bool': ['should': [