codeforleipzig/stadtratmonitor
codeforleipzig/stadtratmonitor
1
1
Fork 0
mirror of https://github.com/CodeforLeipzig/stadtratmonitor.git synced 2024-12-22 23:53:15 +01:00
Code Issues Projects Releases Packages 4 Wiki Activity

Use PaperSearch definition in controller

Browse source
This commit is contained in:
Lars Henrik Mai 2015-10-05 22:13:53 +02:00
parent 8929f07745
commit f883df3347
4 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/search_controller.rb
View file

@ -7,14 +7,12 @@ end
class SearchController < ApplicationController class SearchController < ApplicationController
def index def index
@paper_type = params[:paper_type] @search_definition = PaperSearch.new(query: params[:q],
@originator = params[:originator] paper_type: params[:paper_type],
originator: params[:originator],
sort_by: params[:sort_by])
options = params.slice(:paper_type, :originator, :sort_by) @response = Paper.search(@search_definition)
@show_filters = true
@response = Paper.search(params[:q], options)
@papers = @response.page(params[:page]).results @papers = @response.page(params[:page]).results
@paper_type_facets = extract_facets('paper_types') @paper_type_facets = extract_facets('paper_types')
@originator_facets = extract_facets('originators') @originator_facets = extract_facets('originators')

7
app/models/paper.rb
View file

@ -61,10 +61,9 @@ 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, options={}) def search(search_definition)
@search_definition = PaperSearch.definition(q, options) Rails.logger.debug "Query: #{search_definition.to_json}"
Rails.logger.debug "Query: #{@search_definition.to_json}" __elasticsearch__.search(search_definition)
__elasticsearch__.search(@search_definition)
end end
def reset_index! def reset_index!

11
app/models/paper_search.rb
View file

@ -1,5 +1,14 @@
class PaperSearch class PaperSearch
include ActiveModel::Model
attr_accessor :query, :paper_type, :originator, :sort_by
def to_hash
options = {paper_type: @paper_type, originator: @originator, sort_by: @sort_by}
PaperSearch.definition(@query, options)
end
def self.definition(q, options={}) def self.definition(q, options={})
Elasticsearch::DSL::Search.search do Elasticsearch::DSL::Search.search do
@ -28,7 +37,7 @@ class PaperSearch
must { term paper_type: options[:paper_type] } if options[:paper_type].present? must { term paper_type: options[:paper_type] } if options[:paper_type].present?
must { term originator: options[:originator] } if options[:originator].present? must { term originator: options[:originator] } if options[:originator].present?
# catchall when no filters set # catchall when no filters set
must { match_all } if options.keys.none? {|k| [:paper_type, :originator].include?(k) } must { match_all } unless (options[:paper_type].present? || options[:originator].present?)
end end
end end

7
app/views/search/_form.slim
View file

@ -1,13 +1,12 @@
= form_tag(search_path, method: :get) = form_tag(search_path, method: :get)
= text_field_tag(:q, params[:q], placeholder: 'Suche…', autofocus: true) = text_field_tag(:q, @search_definition.query, placeholder: 'Suche…', autofocus: true)
- if @show_filters
fieldset fieldset
legend Ergebnisse filtern legend Ergebnisse filtern
.row .row
.small-4.columns .small-4.columns
= filter_select("paper_type", "Typ", @paper_type_facets, @paper_type) = filter_select("paper_type", "Typ", @paper_type_facets, @search_definition.paper_type)
.small-4.columns .small-4.columns
= filter_select("originator", "Einreicher", @originator_facets, @originator) = filter_select("originator", "Einreicher", @originator_facets, @search_definition.originator)
.small-4.columns.end .small-4.columns.end
label Sortierung label Sortierung
input type="radio" name="sort_by" value="date" id="sort_by_date" input type="radio" name="sort_by" value="date" id="sort_by_date"