From 74e85953f00f07141a0226ad951646279765a9f5 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 17 Feb 2010 20:20:51 +0000 Subject: [PATCH] Move SQL LIKE tokens to acts_as_searchable. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3445 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/search_controller.rb | 6 ++---- vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index eae38016f..0f0a4e6ae 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -67,16 +67,14 @@ class SearchController < ApplicationController if !@tokens.empty? # no more than 5 tokens to search for - @tokens.slice! 5..-1 if @tokens.size > 5 - # strings used in sql like statement - like_tokens = @tokens.collect {|w| "%#{w.downcase}%"} + @tokens.slice! 5..-1 if @tokens.size > 5 @results = [] @results_by_type = Hash.new {|h,k| h[k] = 0} limit = 10 @scope.each do |s| - r, c = s.singularize.camelcase.constantize.search(like_tokens, projects_to_search, + r, c = s.singularize.camelcase.constantize.search(@tokens, projects_to_search, :all_words => @all_words, :titles_only => @titles_only, :limit => (limit+1), diff --git a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb index 9a81f363f..9106d7bd7 100644 --- a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb +++ b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb @@ -97,7 +97,7 @@ module Redmine sql = (['(' + token_clauses.join(' OR ') + ')'] * tokens.size).join(options[:all_words] ? ' AND ' : ' OR ') - find_options[:conditions] = [sql, * (tokens * token_clauses.size).sort] + find_options[:conditions] = [sql, * (tokens.collect {|w| "%#{w.downcase}%"} * token_clauses.size).sort] project_conditions = [] project_conditions << (searchable_options[:permission].nil? ? Project.visible_by(User.current) : -- 2.39.5