public/opensearch.xml @@ -6,14 +6,14 @@ class SearchController < ApplicationController } def index - @query = params[:query].to_s + @query = params[:q].to_s @facet = 'default' @results = ThinkingSphinx::Search.search(@query + '*', :page => params[:page], :per_page => 10) @facets = ThinkingSphinx::Search.facets(@query + '*')[:class] end def type - @query = params[:query].to_s + @query = params[:q].to_s @type = params[:type].constantize @facet = FACET_BY_TYPE[params[:type]] @results = @type.search(@query + '*', :page => params[:page], :per_page => 10) @@ -22,7 +22,7 @@ class SearchController < ApplicationController end def facet - @query = params[:query].to_s + @query = params[:q].to_s @type = params[:type].constantize @facet = FACET_BY_TYPE[params[:type]] by_facet = @type.facets(@query + '*', :page => params[:page], :per_page => 10) app/controllers/search_controller.rb @@ -7,6 +7,7 @@ - else = stylesheet_link_tag 'style', 'markitup' <link rel="shortcut icon" type="image/x-icon" href="/favicon.png" /> + <link rel="search" type="application/opensearchdescription+xml" title="Recherche LinuxFr.org" href="/opensearch.xml" /> - if @author %meta(name="author" content=@author) %meta(name="description" content=@description) @@ -33,7 +34,7 @@ %li= link_to "Suivi", trackers_path %li= link_to "Plan", static_path(:id => 'plan') - form_tag search_path, :method => :get do - <input id="query" name="query" type="search" placeholder="Entrer un mot-clé" /> + <input id="query" name="q" type="search" placeholder="Entrer un mot-clé" /> = submit_tag "Rechercher", :name => nil %header#branding app/views/layouts/application.html.haml @@ -3,4 +3,4 @@ %ul - @facets.each do |facet,count| %li - = link_to "#{facet} (#{count})", search_by_facet_path(:type => 'Tracker', :facet => facet, :query => @query) + = link_to "#{facet} (#{count})", search_by_facet_path(:type => 'Tracker', :facet => facet, :q => @query) app/views/search/_category_facet.html.haml @@ -3,4 +3,4 @@ %ul - @facets.each do |type,count| %li - = link_to "#{type} (#{count})", search_by_type_path(:type => type, :query => @query) + = link_to "#{type} (#{count})", search_by_type_path(:type => type, :q => @query) app/views/search/_default_facet.html.haml @@ -3,4 +3,4 @@ %ul - @facets.each do |facet,count| %li - = link_to "#{facet} (#{count})", search_by_facet_path(:type => 'Post', :facet => facet, :query => @query) + = link_to "#{facet} (#{count})", search_by_facet_path(:type => 'Post', :facet => facet, :q => @query) app/views/search/_forum_facet.html.haml @@ -3,4 +3,4 @@ %ul - @facets.each do |facet,count| %li - = link_to "#{facet} (#{count})", search_by_facet_path(:type => 'News', :facet => facet, :query => @query) + = link_to "#{facet} (#{count})", search_by_facet_path(:type => 'News', :facet => facet, :q => @query) app/views/search/_section_facet.html.haml @@ -6,5 +6,5 @@ %div %h2 Résultats - @results.each do |result| - = highlight render(result), @query, :highlighter => '<mark>\1</mark>' + = highlight(render(result), @query, :highlighter => '<mark>\1</mark>').html_safe! - will_paginate @results app/views/search/index.html.haml @@ -1,5 +1,6 @@ development: &my_settings pid_file: tmp/pids/searchd.pid + mem_limit: 256M morphology: stem_en enable_star: 1 min_infix_len: 3 config/sphinx.yml 749b480acb0021866407f62e29680bb70ad3183d Bruno Michel bmichel@menfin.info http://github.com/nono/linuxfr.org/commit/30f8362ae71e83c28d36f9dafef26fb215a6258c 30f8362ae71e83c28d36f9dafef26fb215a6258c 2009-11-06T14:22:57-08:00 2009-11-06T14:22:13-08:00 OpenSearch 89aae82b33388697f57282b0a8e0137b139eaf40 Bruno Michel bmichel@menfin.info