mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-25 01:13:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search

Browse Source
This commit is contained in:
Shiho Takagi
2015-01-15 21:33:22 +11:00
parent 9a3c4e69e8 56025d3d33
commit 19dcf6f3d5
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/crop.rb
View File

@@ -40,7 +40,7 @@ class Crop < ActiveRecord::Base
settings index: { number_of_shards: 1},
analysis: {
tokenizer: {
my_ngram_tokenizer: {
gs_edgeNGram_tokenizer: {
type: "edgeNGram",
min_gram: 1,
max_gram: 20,
@@ -48,17 +48,17 @@ class Crop < ActiveRecord::Base
}
},
analyzer: {
my_lowercase_analyzer: {
tokenizer: "my_ngram_tokenizer",
gs_edgeNGram_analyzer: {
tokenizer: "gs_edgeNGram_tokenizer",
filter: ["lowercase"]
}
},
} do
mappings dynamic: 'false' do
indexes :id, type: 'long'
indexes :name, type: 'string', analyzer: 'my_lowercase_analyzer'
indexes :name, type: 'string', analyzer: 'gs_edgeNGram_analyzer'
indexes :scientific_names do
indexes :scientific_name, type: 'string', analyzer: 'my_lowercase_analyzer'
indexes :scientific_name, type: 'string', analyzer: 'gs_edgeNGram_analyzer'
end
end
end

1
spec/models/crop_spec.rb
View File

@@ -327,7 +327,6 @@ describe Crop do
context "search" do
before :each do
Crop.__elasticsearch__.create_index! force: true
@mushroom = FactoryGirl.create(:crop, :name => 'mushroom')
@mushroom.__elasticsearch__.index_document
sleep 1