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

autocomplete: add automatic typo correction.

Browse Source 
If normal autocomplete fails to find any results, try doing a
fuzzy name search instead. This will correct simple typos.
This commit is contained in:
evazion
2017-11-27 13:44:47 -06:00
parent f4d279771f
commit 44f4befa5a
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/autocomplete.js
View File

@@ -244,7 +244,7 @@
$.ajax({ $.ajax({
url: "/tags/autocomplete.json", url: "/tags/autocomplete.json",
data: { data: {
"search[name_matches]": term + "*" "search[name_matches]": term
}, },
method: "get", method: "get",
success: function(data) { success: function(data) {

20
app/models/tag.rb
View File

@@ -890,21 +890,29 @@ class Tag < ApplicationRecord
end end
def names_matches_with_aliases(name) def names_matches_with_aliases(name)
query1 = Tag.select("tags.name, tags.post_count, tags.category, null AS antecedent_name") name = normalize_name(name)
.search(:name_matches => name, :order => "count").limit(10) wildcard_name = name + '*'
query1 = Tag.select("tags.name, tags.post_count, tags.category, null AS antecedent_name")
.search(:name_matches => wildcard_name, :order => "count").limit(10)
name = name.mb_chars.downcase.to_escaped_for_sql_like
query2 = TagAlias.select("tags.name, tags.post_count, tags.category, tag_aliases.antecedent_name") query2 = TagAlias.select("tags.name, tags.post_count, tags.category, tag_aliases.antecedent_name")
.joins("INNER JOIN tags ON tags.name = tag_aliases.consequent_name") .joins("INNER JOIN tags ON tags.name = tag_aliases.consequent_name")
.where("tag_aliases.antecedent_name LIKE ? ESCAPE E'\\\\'", name) .where("tag_aliases.antecedent_name LIKE ? ESCAPE E'\\\\'", wildcard_name.to_escaped_for_sql_like)
.active .active
.where("tags.name NOT LIKE ? ESCAPE E'\\\\'", name) .where("tags.name NOT LIKE ? ESCAPE E'\\\\'", wildcard_name.to_escaped_for_sql_like)
.where("tag_aliases.post_count > 0") .where("tag_aliases.post_count > 0")
.order("tag_aliases.post_count desc") .order("tag_aliases.post_count desc")
.limit(20) # Get 20 records even though only 10 will be displayed in case some duplicates get filtered out. .limit(20) # Get 20 records even though only 10 will be displayed in case some duplicates get filtered out.
sql_query = "((#{query1.to_sql}) UNION ALL (#{query2.to_sql})) AS unioned_query" sql_query = "((#{query1.to_sql}) UNION ALL (#{query2.to_sql})) AS unioned_query"
Tag.select("DISTINCT ON (name, post_count) *").from(sql_query).order("post_count desc").limit(10) tags = Tag.select("DISTINCT ON (name, post_count) *").from(sql_query).order("post_count desc").limit(10)
if tags.empty?
tags = Tag.fuzzy_name_matches(name).order_similarity(name).nonempty.limit(10)
end
tags
end end
end end