Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added basic locale recognition for expected FTS stemming

This commit is contained in:
Kirill Pimenov 2013-02-28 23:14:22 +04:00
parent 2f3ba0a791
commit ee0396198e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/search.rb
View File

@ -87,6 +87,16 @@ module Search
" "
end end
def self.current_locale_long
case I18n.locale # Currently-present in /conf/locales/* only, sorry :-( Add as needed
when :ru then 'russian'
when :fr then 'french'
when :nl then 'dutch'
when :sv then 'swedish'
else 'english'
end
end
def self.query(term, type_filter=nil) def self.query(term, type_filter=nil)
return nil if term.blank? return nil if term.blank?
@ -101,12 +111,12 @@ module Search
if type_filter.present? if type_filter.present?
raise Discourse::InvalidAccess.new("invalid type filter") unless Search.facets.include?(type_filter) raise Discourse::InvalidAccess.new("invalid type filter") unless Search.facets.include?(type_filter)
sql = Search.send("#{type_filter}_query_sql") sql = Search.send("#{type_filter}_query_sql")
db_result = ActiveRecord::Base.exec_sql(sql , query: terms.join(" & "), locale: 'english', limit: Search.per_facet * Search.facets.size) db_result = ActiveRecord::Base.exec_sql(sql , query: terms.join(" & "), locale: current_locale_long, limit: Search.per_facet * Search.facets.size)
else else
db_result = [] db_result = []
[user_query_sql, category_query_sql, topic_query_sql].each do |sql| [user_query_sql, category_query_sql, topic_query_sql].each do |sql|
db_result += ActiveRecord::Base.exec_sql(sql , query: terms.join(" & "),locale: 'english', limit: (Search.per_facet + 1)).to_a db_result += ActiveRecord::Base.exec_sql(sql , query: terms.join(" & "),locale: current_locale_long, limit: (Search.per_facet + 1)).to_a
end end
end end
@ -124,7 +134,7 @@ module Search
if expected_topics > 0 if expected_topics > 0
tmp = ActiveRecord::Base.exec_sql post_query_sql, tmp = ActiveRecord::Base.exec_sql post_query_sql,
query: terms.join(" & "), locale: 'english', limit: expected_topics * 3 query: terms.join(" & "), locale: current_locale_long, limit: expected_topics * 3
topic_ids = Set.new db_result.map{|r| r["id"]} topic_ids = Set.new db_result.map{|r| r["id"]}