jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wiki pages: add wildcard support to "other names" search.

Browse Source
This commit is contained in:
evazion
2017-05-23 20:59:48 -05:00
parent f93cd11fb5
commit 1a52f9db2b
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/wiki_page.rb
View File

@@ -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?