github / searchkick

Download as
Browse Code ยป

Commit bbe533241441031bf137732e9ce528f3d9d5250f

Authored by Andrew Kane
1 parent e341552c
Exists in master and in 8 other branches allow_missing, conversions_v2, lazy_index_name, less_deps, scope_attributes, search_as_you_type, synonyms_ci, test_language

Moved stem code

Showing 1 changed file with 8 additions and 7 deletions   Show diff stats
lib/searchkick/index_options.rb
  Diff comments   View file @bbe5332
... ... @@ -156,6 +156,13 @@ module Searchkick
156 156 stem = options[:stem]
157 157 stem = false if update_language(settings)
158 158  
  159 + if stem == false
  160 + settings[:analysis][:filter].delete(:searchkick_stemmer)
  161 + settings[:analysis][:analyzer].each do |_, analyzer|
  162 + analyzer[:filter].delete("searchkick_stemmer") if analyzer[:filter]
  163 + end
  164 + end
  165 +
159 166 if Searchkick.env == "test"
160 167 settings[:number_of_shards] = 1
161 168 settings[:number_of_replicas] = 0
... ... @@ -178,13 +185,7 @@ module Searchkick
178 185 end
179 186 end
180 187  
181   - if stem == false
182   - settings[:analysis][:filter].delete(:searchkick_stemmer)
183   - settings[:analysis][:analyzer].each do |_, analyzer|
184   - analyzer[:filter].delete("searchkick_stemmer") if analyzer[:filter]
185   - end
186   - end
187   -
  188 + # TODO do this last in Searchkick 5
188 189 settings = settings.symbolize_keys.deep_merge((options[:settings] || {}).symbolize_keys)
189 190  
190 191 add_synonyms(settings)
... ...