improved search engine

* it's now possible to search for multiple words ("all words" or "one of the words" options)
* added a fixed limit for result count

git-svn-id: http://redmine.rubyforge.org/svn/trunk@321 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index e2ddd3df5a0dd1fe4bf4591d36f9e3c7c6ef376f..4a957a9cb8c86a544e4d013d62730649a44aff77 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -540,16 +540,24 @@ class ProjectsController < ApplicationController
   end\r
   \r
   def search\r
-    @token = params[:token]\r
+    @question = params[:q] || ""\r
+    @question.strip!\r
+    @all_words = params[:all_words] || (params[:submit] ? false : true)\r
     @scope = params[:scope] || (params[:submit] ? [] : %w(issues news documents) )\r
-\r
-    if @token and @token.length > 2\r
-      @token.strip!\r
-      like_token = "%#{@token}%"\r
+    if !@question.empty?\r
+      # tokens must be at least 3 character long\r
+      @tokens = @question.split.uniq.select {|w| w.length > 2 }\r
+      # no more than 5 tokens to search for\r
+      @tokens.slice! 5..-1 if @tokens.size > 5\r
+      # strings used in sql like statement\r
+      like_tokens = @tokens.collect {|w| "%#{w}%"}\r
+      operator = @all_words ? " AND " : " OR "\r
+      limit = 10\r
       @results = []\r
-      @results += @project.issues.find(:all, :include => :author, :conditions => ["issues.subject like ? or issues.description like ?", like_token, like_token] ) if @scope.include? 'issues'\r
-      @results += @project.news.find(:all, :conditions => ["news.title like ? or news.description like ?", like_token, like_token], :include => :author ) if @scope.include? 'news'\r
-      @results += @project.documents.find(:all, :conditions => ["title like ? or description like ?", like_token, like_token] ) if @scope.include? 'documents'\r
+      @results += @project.issues.find(:all, :limit => limit, :include => :author, :conditions => [ (["(LOWER(issues.subject) like ? OR LOWER(issues.description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'issues'\r
+      @results += @project.news.find(:all, :limit => limit, :conditions => [ (["(LOWER(news.title) like ? OR LOWER(news.description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort], :include => :author ) if @scope.include? 'news'\r
+      @results += @project.documents.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'documents'\r
+      @question = @tokens.join(" ")\r
     end\r
   end\r
   \r

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index a6c033d0ffc70dede88079b559f890441ff7efb9..694dd91241be5045d585264dc4eca64f14bea987 100644 (file)
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -16,8 +16,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\r
 \r
 module ProjectsHelper\r
-  def result_overview(text, token)\r
-    match = excerpt(text, token)\r
-    match ? highlight(match, token) : truncate(text, 150)\r
+\r
+  def highlight_tokens(text, tokens)\r
+    return text unless tokens && !tokens.empty?\r
+    regexp = Regexp.new "(#{tokens.join('|')})", Regexp::IGNORECASE    \r
+    result = ''\r
+    text.split(regexp).each_with_index do |words, i|\r
+      result << (i.even? ? (words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words) : content_tag('span', words, :class => 'highlight'))\r
+    end\r
+    result\r
   end
 end

diff --git a/app/views/projects/search.rhtml b/app/views/projects/search.rhtml
index df95ee3ae7cf1d3d090ae51568332cf631ad8f5f..e699d8731c7c008efdcc92ec769e4bd81685c24b 100644 (file)
--- a/app/views/projects/search.rhtml
+++ b/app/views/projects/search.rhtml
@@ -2,10 +2,11 @@
 \r
 <div class="box">\r
 <% form_tag({:action => 'search', :id => @project}, :method => :get) do %>\r
-<p><%= text_field_tag 'token', @token, :size => 30 %>\r
+<p><%= text_field_tag 'q', @question, :size => 30 %>\r
 <%= check_box_tag 'scope[]', 'issues', (@scope.include? 'issues') %> <label><%= l(:label_issue_plural) %></label>\r
 <%= check_box_tag 'scope[]', 'news', (@scope.include? 'news') %> <label><%= l(:label_news_plural) %></label>\r
-<%= check_box_tag 'scope[]', 'documents', (@scope.include? 'documents') %> <label><%= l(:label_document_plural) %></label></p>\r
+<%= check_box_tag 'scope[]', 'documents', (@scope.include? 'documents') %> <label><%= l(:label_document_plural) %></label><br />\r
+<%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></p>\r
 <%= submit_tag l(:button_submit), :name => 'submit' %>\r
 <% end %>\r
 </div>\r
@@ -16,16 +17,16 @@
       <% @results.each do |e| %>\r
         <li><p>\r
         <% if e.is_a? Issue %>\r
-            <%= link_to "#{e.tracker.name} ##{e.id}", :controller => 'issues', :action => 'show', :id => e %>: <%= highlight(h(e.subject), @token) %><br />\r
-            <%= result_overview(e.description, @token) %><br />\r
+            <%= link_to "#{e.tracker.name} ##{e.id}", :controller => 'issues', :action => 'show', :id => e %>: <%= highlight_tokens(h(e.subject), @tokens) %><br />\r
+            <%= highlight_tokens(e.description, @tokens) %><br />\r
             <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>\r
         <% elsif e.is_a? News %>\r
-            <%=l(:label_news)%>: <%= link_to highlight(h(e.title), @token), :controller => 'news', :action => 'show', :id => e %><br />\r
-            <%= result_overview(e.description, @token) %><br />\r
+            <%=l(:label_news)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'news', :action => 'show', :id => e %><br />\r
+            <%= highlight_tokens(e.description, @tokens) %><br />\r
             <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>\r
         <% elsif e.is_a? Document %>\r
-            <%=l(:label_document)%>: <%= link_to highlight(h(e.title), @token), :controller => 'documents', :action => 'show', :id => e %><br />\r
-            <%= result_overview(e.description, @token) %><br />\r
+            <%=l(:label_document)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'documents', :action => 'show', :id => e %><br />\r
+            <%= highlight_tokens(e.description, @tokens) %><br />\r
             <i><%= format_time(e.created_on) %></i>\r
         <% end %>\r
         </p></li>  \r

diff --git a/lang/de.yml b/lang/de.yml
index 69cc23df72babcc1a5e105ea729cb1658fd91cc0..cb253b3836941c3c5b78abe730067b5fe8928fe5 100644 (file)
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -321,6 +321,7 @@ label_roadmap: Roadmap
 label_search: Suche\r
 label_result: %d Resultat\r
 label_result_plural: %d Resultate\r
+label_all_words: Alle Wörter\r
 \r
 button_login: Einloggen\r
 button_submit: Einreichen\r

diff --git a/lang/en.yml b/lang/en.yml
index c8026e6295e9d1c1e82a238ea7f0a42ffdead821..20a43e56459c41ee4e8bb60644e1d1b53d940394 100644 (file)
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -321,6 +321,7 @@ label_roadmap: Roadmap
 label_search: Search\r
 label_result: %d result\r
 label_result_plural: %d results\r
+label_all_words: All words\r
 \r
 button_login: Login\r
 button_submit: Submit\r

diff --git a/lang/es.yml b/lang/es.yml
index 79c96adf48d8d238cad7fbbc2290cd764c48a878..3004470e66febbeeb9a6372b4d3b8538ec046183 100644 (file)
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -321,6 +321,7 @@ label_roadmap: Roadmap
 label_search: Búsqueda\r
 label_result: %d resultado\r
 label_result_plural: %d resultados\r
+label_all_words: Todas las palabras\r
 \r
 button_login: Conexión\r
 button_submit: Someter\r

diff --git a/lang/fr.yml b/lang/fr.yml
index 90e2c6628f6bbdc5b83f0c045a3384dec278f029..fba9cb9fbb8c8c5f881a3ee5b59ad6f5305fe131 100644 (file)
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -321,6 +321,7 @@ label_roadmap: Roadmap
 label_search: Recherche\r
 label_result: %d résultat\r
 label_result_plural: %d résultats\r
+label_all_words: Tous les mots\r
 \r
 button_login: Connexion\r
 button_submit: Soumettre\r

diff --git a/lang/ja.yml b/lang/ja.yml
index b473f4c0aa1db6dcec806f357aa156838f43ce5c..86dcd7f3f1383e0c813c78b6fe6e7de7f314e8be 100644 (file)
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -322,6 +322,7 @@ label_roadmap: ロードマップ
 label_search: 検索\r
 label_result: %d 件の結果\r
 label_result_plural: %d 件の結果\r
+label_all_words: すべての単語\r
 \r
 button_login: ログイン\r
 button_submit: 変更\r

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 732349adf1b565ed6e3d83da2ae45d0651a8f9ee..40997af979fb846c329e32f9208e024bd2cad367 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -243,7 +243,7 @@ legend {color: #505050;}
 hr { border:0; border-top: dotted 1px #fff; border-bottom: dotted 1px #c0c0c0; }\r
 table p {margin:0; padding:0;}\r
 \r
-strong.highlight { background-color: #FCFD8D;}\r
+.highlight { background-color: #FCFD8D;}\r
 \r
 div.square {\r
  border: 1px solid #999;\r