add filter by paper_type

This commit is contained in:
Lars Henrik Mai 2015-06-22 20:38:24 +02:00 committed by Andreas Haller
parent 7a7083c2ad
commit 41ed4a9674
2 changed files with 27 additions and 9 deletions

View file

@ -1,6 +1,9 @@
class SearchController < ApplicationController class SearchController < ApplicationController
def index def index
@response = Paper.search(params[:q]) @paper_type = params[:paper_type]
options = params.slice(:paper_type)
@response = Paper.search(params[:q], options)
@papers = @response.page(params[:page]).results @papers = @response.page(params[:page]).results
@paper_type_facets = @response.response['aggregations']['paper_types']['buckets'].map {|h| [ h['key'], h['doc_count']] } @paper_type_facets = @response.response['aggregations']['paper_types']['buckets'].map {|h| [ h['key'], h['doc_count']] }
@originator_facets = @response.response['aggregations']['originators']['buckets'].map {|h| [ h['key'], h['doc_count']] } @originator_facets = @response.response['aggregations']['originators']['buckets'].map {|h| [ h['key'], h['doc_count']] }

View file

@ -43,17 +43,32 @@ class Paper < ActiveRecord::Base
# use DSL to define search queries # use DSL to define search queries
# see https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-dsl # see https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-dsl
# and https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-rails/lib/rails/templates # and https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-rails/lib/rails/templates
def search(q) def search(q, options={})
@search_definition = Elasticsearch::DSL::Search.search do @search_definition = Elasticsearch::DSL::Search.search do
query do query do
unless q.blank? filtered do
multi_match do
query q query do
fields ["name", "content"] # search query
unless q.blank?
multi_match do
query q
fields ["name", "content"]
end
else
match_all
end
end end
else
match_all # filters
filter do
bool do
must { term paper_type: options[:paper_type] } if options[:paper_type]
must { match_all } unless options[:paper_type]
end
end
end end
end end
@ -70,7 +85,7 @@ class Paper < ActiveRecord::Base
end end
end end
puts @search_definition.to_hash Rails.logger.debug "Query: #{@search_definition.to_json}"
__elasticsearch__.search(@search_definition) __elasticsearch__.search(@search_definition)
end end