wiki pages: add wildcard support to "other names" search.
This commit is contained in:
@@ -54,7 +54,7 @@ module Sources
|
||||
tag
|
||||
end
|
||||
end
|
||||
WikiPage.other_names_match(untranslated_tags).map{|wiki_page| [wiki_page.title, wiki_page.category_name]}
|
||||
WikiPage.other_names_equal(untranslated_tags).map{|wiki_page| [wiki_page.title, wiki_page.category_name]}
|
||||
end
|
||||
|
||||
def to_h
|
||||
|
||||
@@ -40,12 +40,20 @@ class WikiPage < ActiveRecord::Base
|
||||
end
|
||||
end
|
||||
|
||||
def other_names_match(names)
|
||||
names = names.map{|name| name.to_escaped_for_tsquery}
|
||||
query_sql = names.join(" | ")
|
||||
def other_names_equal(names)
|
||||
query_sql = names.map(&:to_escaped_for_tsquery).join(" | ")
|
||||
where("other_names_index @@ to_tsquery('danbooru', E?)", query_sql)
|
||||
end
|
||||
|
||||
def other_names_match(name)
|
||||
if name =~ /\*/
|
||||
subquery = WikiPage.from("unnest(string_to_array(other_names, ' ')) AS other_name").where("other_name ILIKE ?", name.to_escaped_for_sql_like)
|
||||
where(id: subquery)
|
||||
else
|
||||
other_names_equal([name])
|
||||
end
|
||||
end
|
||||
|
||||
def search(params = {})
|
||||
q = where("true")
|
||||
params = {} if params.blank?
|
||||
@@ -63,7 +71,7 @@ class WikiPage < ActiveRecord::Base
|
||||
end
|
||||
|
||||
if params[:other_names_match].present?
|
||||
q = q.other_names_match(params[:other_names_match].split(" "))
|
||||
q = q.other_names_match(params[:other_names_match])
|
||||
end
|
||||
|
||||
if params[:creator_name].present?
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<%= search_field "title", :hint => "Use * for wildcard searches" %>
|
||||
<%= search_field "creator_name" %>
|
||||
<%= search_field "body_matches", :label => "Body" %>
|
||||
<%= search_field "other_names_match", :label => "Other names" %>
|
||||
<%= search_field "other_names_match", :label => "Other names", :hint => "Use * for wildcard searches" %>
|
||||
|
||||
<div class="input">
|
||||
<label for="search_other_names_present">Other names present?</label>
|
||||
|
||||
Reference in New Issue
Block a user