glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update main_controller.rb

Browse source 
Made the changes from earlier comments... mostly just adding '%' to many of the searches
This commit is contained in:
Robert Best 2014-02-18 22:44:10 -05:00
parent 2fdcb5dcc5
commit 7cff0fb6fe
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/controllers/main_controller.rb
View file

@ -62,12 +62,10 @@ class MainController < ApplicationController
end end
if filterByMetacode if filterByMetacode
# !connor : Shouldn't this be checked for all cases, not just metacodes?
if term == "" if term == ""
@topics = [] @topics = []
else else
# !connor add % to the frontof this one too? why not? search = '%' + term.downcase + '%'
search = term.downcase + '%'
if !user if !user
@topics = Topic.where('LOWER("name") like ?', search).where('metacode_id = ?', filterByMetacode.id).order('"name"') @topics = Topic.where('LOWER("name") like ?', search).where('metacode_id = ?', filterByMetacode.id).order('"name"')
@ -90,8 +88,7 @@ class MainController < ApplicationController
@topics = Topic.where('LOWER("link") like ?', search).where('user_id = ?', user).order('"name"') @topics = Topic.where('LOWER("link") like ?', search).where('user_id = ?', user).order('"name"')
end end
else #regular case, just search the name else #regular case, just search the name
# !connor : Definitely add the % out front here. search = '%' + term.downcase + '%'
search = term.downcase + '%'
if !user if !user
@topics = Topic.where('LOWER("name") like ?', search).order('"name"') @topics = Topic.where('LOWER("name") like ?', search).order('"name"')
elsif user elsif user
@ -113,7 +110,6 @@ class MainController < ApplicationController
@current = current_user @current = current_user
term = params[:term] term = params[:term]
#!connor is nil the same as false? why is it done different here?
user = params[:user] ? params[:user] : nil user = params[:user] ? params[:user] : nil
if term && !term.empty? && term.downcase[0..5] != "topic:" && term.downcase[0..6] != "mapper:" && term.downcase != "map:" if term && !term.empty? && term.downcase[0..5] != "topic:" && term.downcase[0..6] != "mapper:" && term.downcase != "map:"
@ -127,8 +123,7 @@ class MainController < ApplicationController
term = term[5..-1] term = term[5..-1]
desc = true desc = true
end end
# !connor make the search always '%' : term.downcase + '%' search = '%' + term.downcase + '%'
search = desc ? '%' + term.downcase + '%' : term.downcase + '%'
query = desc ? 'LOWER("desc") like ?' : 'LOWER("name") like ?' query = desc ? 'LOWER("desc") like ?' : 'LOWER("name") like ?'
if !user if !user
# !connor why is the limit 5 done here and not above? also, why not limit after sorting alphabetically? # !connor why is the limit 5 done here and not above? also, why not limit after sorting alphabetically?
@ -155,7 +150,6 @@ class MainController < ApplicationController
#remove "mapper:" if appended at beginning #remove "mapper:" if appended at beginning
term = term[7..-1] if term.downcase[0..6] == "mapper:" term = term[7..-1] if term.downcase[0..6] == "mapper:"
# !connor same question as above
@mappers = User.where('LOWER("name") like ?', term.downcase + '%').limit(5).order('"name"') @mappers = User.where('LOWER("name") like ?', term.downcase + '%').limit(5).order('"name"')
else else
@mappers = [] @mappers = []
@ -174,8 +168,7 @@ class MainController < ApplicationController
if term && !term.empty? if term && !term.empty?
@synapses = Synapse.select('DISTINCT "desc"'). @synapses = Synapse.select('DISTINCT "desc"').
# !connor this should likely also have the preceeding % where('LOWER("desc") like ?', '%' + term.downcase + '%').limit(5).order('"desc"')
where('LOWER("desc") like ?', term.downcase + '%').limit(5).order('"desc"')
render json: autocomplete_synapse_generic_json(@synapses) render json: autocomplete_synapse_generic_json(@synapses)