vendor/gems/searchlogic-2.3.5/.gitignore vendor/gems/searchlogic-2.3.5/.specification vendor/gems/searchlogic-2.3.5/CHANGELOG.rdoc vendor/gems/searchlogic-2.3.5/LICENSE vendor/gems/searchlogic-2.3.5/README.rdoc vendor/gems/searchlogic-2.3.5/Rakefile vendor/gems/searchlogic-2.3.5/VERSION.yml vendor/gems/searchlogic-2.3.5/init.rb vendor/gems/searchlogic-2.3.5/lib/searchlogic.rb vendor/gems/searchlogic-2.3.5/lib/searchlogic/active_record/consistency.rb vendor/gems/searchlogic-2.3.5/lib/searchlogic/active_record/named_scopes.rb vendor/gems/searchlogic-2.3.5/lib/searchlogic/core_ext/object.rb vendor/gems/searchlogic-2.3.5/lib/searchlogic/core_ext/proc.rb vendor/gems/searchlogic-2.3.5/lib/searchlogic/named_scopes/alias_scope.rb vendor/gems/searchlogic-2.3.5/lib/searchlogic/named_scopes/association_conditions.rb vendor/gems/searchlogic-2.3.5/lib/searchlogic/named_scopes/association_ordering.rb vendor/gems/searchlogic-2.3.5/lib/searchlogic/named_scopes/conditions.rb vendor/gems/searchlogic-2.3.5/lib/searchlogic/named_scopes/or_conditions.rb vendor/gems/searchlogic-2.3.5/lib/searchlogic/named_scopes/ordering.rb vendor/gems/searchlogic-2.3.5/lib/searchlogic/rails_helpers.rb vendor/gems/searchlogic-2.3.5/lib/searchlogic/search.rb vendor/gems/searchlogic-2.3.5/rails/init.rb vendor/gems/searchlogic-2.3.5/searchlogic.gemspec vendor/gems/searchlogic-2.3.5/spec/core_ext/object_spec.rb vendor/gems/searchlogic-2.3.5/spec/core_ext/proc_spec.rb vendor/gems/searchlogic-2.3.5/spec/named_scopes/alias_scope_spec.rb vendor/gems/searchlogic-2.3.5/spec/named_scopes/association_conditions_spec.rb vendor/gems/searchlogic-2.3.5/spec/named_scopes/association_ordering_spec.rb vendor/gems/searchlogic-2.3.5/spec/named_scopes/conditions_spec.rb vendor/gems/searchlogic-2.3.5/spec/named_scopes/or_conditions_spec.rb vendor/gems/searchlogic-2.3.5/spec/named_scopes/ordering_spec.rb vendor/gems/searchlogic-2.3.5/spec/search_spec.rb vendor/gems/searchlogic-2.3.5/spec/spec_helper.rb @@ -4,31 +4,31 @@ class SearchController < ApplicationController if params[:type].blank? || params[:query].blank? render :template => 'search/index' elsif params[:type] == 'articles' - @articles = Article.all(:include => :user, :order => 'created_at desc', :conditions => ['title LIKE ? OR body LIKE ?', '%'+params[:query]+'%', '%'+params[:query]+'%']) + @articles = Article.title_or_body_like(params[:query]).all(:include => :user, :order => 'articles.created_at desc') render :template => 'articles/archives' elsif params[:type] == 'avatars' - @avatars = Avatar.paginate(:page => params[:page], :include => :user, :order => 'avatars.created_at desc', :conditions => ['attachment_file_name LIKE ?', '%' + params[:query] + '%']) + @avatars = Avatar.attachment_file_name_like(params[:query]).paginate(:page => params[:page], :include => :user, :order => 'avatars.created_at desc') render :template => 'avatars/index' elsif params[:type] == 'events' - @events = Event.paginate(:page => params[:page], :include => :user, :order => 'events.created_at desc', :conditions => ['title LIKE ?', '%' + params[:query] + '%']) + @events = Event.title_or_description_like(params[:query]).paginate(:page => params[:page], :include => :user, :order => 'events.created_at desc') render :template => 'events/index' elsif params[:type] == 'files' - @uploads = Upload.paginate(:page => params[:page], :include => :user, :order => 'uploads.created_at desc', :conditions => ['attachment_file_name LIKE ?', '%' + params[:query] + '%']) + @uploads = Upload.attachment_file_name_like(params[:query]).paginate(:page => params[:page], :include => :user, :order => 'uploads.created_at desc') render :template => 'uploads/index' elsif params[:type] == 'headers' - @headers = Header.paginate(:page => params[:page], :include => :user, :order => 'headers.created_at desc', :conditions => ['attachment_file_name LIKE ?', '%' + params[:query] + '%']) + @headers = Header.attachment_file_name_or_description_like(params[:query]).paginate(:page => params[:page], :include => :user, :order => 'headers.created_at desc') render :template => 'headers/index' elsif params[:type] == 'messages' - @messages = Message.paginate(:page => params[:page], :include => :user, :order => 'messages.created_at desc', :conditions => ['body LIKE ?', '%' + params[:query] + '%']) + @messages = Message.body_like(params[:query]).paginate(:page => params[:page], :include => :user, :order => 'messages.created_at desc') render :template => 'search/messages' elsif params[:type] == 'posts' - @posts = Post.paginate(:page => params[:page], :include => [:user, :topic], :order => 'posts.created_at desc', :conditions => ['body LIKE ?', '%' + params[:query] + '%']) + @posts = Post.body_like(params[:query]).paginate(:page => params[:page], :include => :user, :order => 'posts.created_at desc') render :template => 'topics/show' elsif params[:type] == 'topics' - @topics = Topic.get(params[:page], 30, ['title LIKE ?', '%' + params[:query] + '%']) + @topics = Topic.title_like(params[:query]).paginate(:page => params[:page], :include => [:user, :forum, :last_poster, :viewings], :order => 'topics.last_post_at desc') render :template => 'topics/index' elsif params[:type] == 'users' - @users = User.paginate(:page => params[:page], :order => 'created_at desc', :conditions => ['login LIKE ?', '%' + params[:query] + '%']) + @users = User.login_or_bio_or_signature_like(params[:query]).paginate(:page => params[:page], :order => 'created_at desc') render :template => 'users/index' end end app/controllers/search_controller.rb @@ -20,23 +20,25 @@ <% end %> <% if current_controller == 'search' %> - <table cellspacing="0"> - <thead> - <tr> - <th class="tcl" colspan="2">Events</th> - <th class="tcr">Date</th> - </tr> - </thead> - <tbody> - <% for event in @events %> + <% if !@events.blank? %> + <table cellspacing="0"> + <thead> <tr> - <td class="tci"><%= icon_for(event) %></td> - <td class="tcl"> - <%= link_to h(event), event %> by <%=h event.user %> - </td> - <td class="tcr"><%= time_stamp(event.date) %></td> + <th class="tcl" colspan="2">Events</th> + <th class="tcr">Date</th> </tr> - <% end %> - </tbody> - </table> + </thead> + <tbody> + <% for event in @events %> + <tr> + <td class="tci"><%= icon_for(event) %></td> + <td class="tcl"> + <%= link_to h(event), event %> by <%=h event.user %> + </td> + <td class="tcr"><%= time_stamp(event.date) %></td> + </tr> + <% end %> + </tbody> + </table> + <% end %> <% end %> \ No newline at end of file app/views/events/index.html.erb @@ -12,6 +12,7 @@ Rails::Initializer.run do |config| config.gem 'mislav-will_paginate', :version => '2.3.11', :lib => 'will_paginate', :source => 'http://gems.github.com' config.gem "openrain-action_mailer_tls", :version => '1.1.3', :lib => "smtp_tls", :source => "http://gems.github.com" + config.gem 'searchlogic', :version => '2.3.5' config.gem 'thoughtbot-paperclip', :version => '2.2.9.2', :lib => 'paperclip', :source => 'http://gems.github.com' config.gem 'right_aws', :version => '1.9.0' # TODO change to aws-s3 when paperclip does; right_aws 1.10.0 acts funny config.gem 'right_http_connection', :version => '1.2.4' config/environment.rb c6236754d0c3c4190d997562f7cb61f875ea1e3a Trevor Turk trevorturk@gmail.com http://github.com/trevorturk/eldorado/commit/1e0fa403b72c4e7d380d8ac2e14ac3b2e79bddc9 1e0fa403b72c4e7d380d8ac2e14ac3b2e79bddc9 2009-10-11T13:05:22-07:00 2009-10-11T13:05:22-07:00 use searchlogic gem for case insensitive searching and simplification fcb92f56c43f11c29368ad4d5814510d73fd2054 Trevor Turk trevorturk@gmail.com