From 656b0e44d8dbceb01a10c2b59ef6f07f724f111d Mon Sep 17 00:00:00 2001 From: Shiho Takagi Date: Mon, 2 Feb 2015 18:40:24 +1100 Subject: [PATCH 1/3] fixing issue with elasticsearch option false in dev --- app/models/alternate_name.rb | 2 +- app/models/crop.rb | 2 +- app/models/scientific_name.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/alternate_name.rb b/app/models/alternate_name.rb index cb6f79e9d..857adf7ec 100644 --- a/app/models/alternate_name.rb +++ b/app/models/alternate_name.rb @@ -1,5 +1,5 @@ class AlternateName < ActiveRecord::Base - after_commit { |an| an.crop.__elasticsearch__.index_document if an.crop } + after_commit { |an| an.crop.__elasticsearch__.index_document if an.crop && ENV['GROWSTUFF_ELASTICSEARCH'] == "true" } belongs_to :crop belongs_to :creator, :class_name => 'Member' end diff --git a/app/models/crop.rb b/app/models/crop.rb index 82d1e24a0..831c8ccb4 100644 --- a/app/models/crop.rb +++ b/app/models/crop.rb @@ -85,7 +85,7 @@ class Crop < ActiveRecord::Base end def update_index(name_obj) - __elasticsearch__.index_document + __elasticsearch__.index_document if ENV['GROWSTUFF_ELASTICSEARCH'] == "true" end #################################### diff --git a/app/models/scientific_name.rb b/app/models/scientific_name.rb index 7469b3946..aec8f1091 100644 --- a/app/models/scientific_name.rb +++ b/app/models/scientific_name.rb @@ -1,5 +1,5 @@ class ScientificName < ActiveRecord::Base - after_commit { |sn| sn.crop.__elasticsearch__.index_document if sn.crop } + after_commit { |sn| sn.crop.__elasticsearch__.index_document if sn.crop && ENV['GROWSTUFF_ELASTICSEARCH'] == "true" } belongs_to :crop belongs_to :creator, :class_name => 'Member' end From 5bfab90b5b3d5a52f8cb67014aa78da76ea6b52f Mon Sep 17 00:00:00 2001 From: Shiho Takagi Date: Thu, 12 Feb 2015 16:31:57 +1100 Subject: [PATCH 2/3] updated the crop search query for more accurate search --- app/models/crop.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/crop.rb b/app/models/crop.rb index 831c8ccb4..ff996143f 100644 --- a/app/models/crop.rb +++ b/app/models/crop.rb @@ -267,6 +267,7 @@ class Crop < ActiveRecord::Base query: { multi_match: { query: "#{search_str}", + analyzer: "standard", fields: ["name", "scientific_names.scientific_name", "alternate_names.name"] } }, From e09f050088bfeac5a0b85e64581fb84d16f2eda0 Mon Sep 17 00:00:00 2001 From: Shiho Takagi Date: Thu, 12 Feb 2015 16:31:57 +1100 Subject: [PATCH 3/3] updated the crop search query for more accurate search --- app/controllers/crops_controller.rb | 1 + app/models/crop.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb index 92ee759a2..9e6bb005a 100644 --- a/app/controllers/crops_controller.rb +++ b/app/controllers/crops_controller.rb @@ -49,6 +49,7 @@ class CropsController < ApplicationController # GET /crops/search def search + @search = params[:search] @all_matches = Crop.search(params[:search]) exact_match = Crop.find_by_name(params[:search]) if exact_match diff --git a/app/models/crop.rb b/app/models/crop.rb index 831c8ccb4..ff996143f 100644 --- a/app/models/crop.rb +++ b/app/models/crop.rb @@ -267,6 +267,7 @@ class Crop < ActiveRecord::Base query: { multi_match: { query: "#{search_str}", + analyzer: "standard", fields: ["name", "scientific_names.scientific_name", "alternate_names.name"] } },