Remove extra token from search
This commit is contained in:
parent
d1b1db25ed
commit
5fe0613a97
2 changed files with 5 additions and 4 deletions
|
|
@ -45,8 +45,7 @@ class Person < ActiveRecord::Base
|
|||
profiles.last_name LIKE ? OR
|
||||
people.diaspora_handle LIKE ? OR
|
||||
profiles.first_name LIKE ? OR
|
||||
profiles.last_name LIKE ? OR
|
||||
people.diaspora_handle LIKE ?
|
||||
profiles.last_name LIKE ?
|
||||
SQL
|
||||
sql = ""
|
||||
tokens = []
|
||||
|
|
@ -54,11 +53,11 @@ class Person < ActiveRecord::Base
|
|||
query_tokens = query.to_s.strip.split(" ")
|
||||
query_tokens.each_with_index do |raw_token, i|
|
||||
token = "%#{raw_token}%"
|
||||
up_token = "%#{raw_token.titleize}%"
|
||||
up_token = "#{raw_token.titleize}%"
|
||||
sql << " OR " unless i == 0
|
||||
sql << where_clause
|
||||
tokens.concat([token, token, token])
|
||||
tokens.concat([up_token, up_token, up_token])
|
||||
tokens.concat([up_token, up_token])
|
||||
end
|
||||
#SELECT `people`.* FROM people
|
||||
# INNER JOIN `profiles` ON `profiles`.person_id = `people`.id
|
||||
|
|
|
|||
|
|
@ -229,6 +229,8 @@ describe Person do
|
|||
people = Person.search("ing", @user)
|
||||
people.map{|p| p.name}.should == [@casey_grippi, @yevgeniy_dodis, @robert_grimm, @eugene_weinstein].map{|p|p.name}
|
||||
end
|
||||
|
||||
it 'has no duplicate contacts'
|
||||
end
|
||||
|
||||
context 'people finders for webfinger' do
|
||||
|
|
|
|||
Loading…
Reference in a new issue