diff options
| author | mo kareem <email@mokhan.ca> | 2011-05-26 21:35:51 -0600 |
|---|---|---|
| committer | mo kareem <email@mokhan.ca> | 2011-05-26 21:35:51 -0600 |
| commit | b13cc439e8e04c050b9e902b9fa6677d806df0a3 (patch) | |
| tree | f9be66f83c108a418fe2d9e3b04e841977b208ac | |
| parent | 51118147c2ab5593bfea475f2b16d848a1913559 (diff) | |
add the story of each creation to the full text search index.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | app/controllers/search_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/creation.rb | 1 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 2 | ||||
| -rw-r--r-- | config/development.sphinx.conf | 2 | ||||
| -rw-r--r-- | log/searchd.development.pid | 1 |
6 files changed, 5 insertions, 4 deletions
@@ -5,3 +5,4 @@ tmp/**/* *.swp public/uploads/ db/sphinx/development/* +log/* diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 96855ed4..b533907a 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -1,6 +1,6 @@ class SearchController < ApplicationController def index - @creations = Creation.search params[:search], :include => :user, :match_mode => :boolean + @creations = Creation.search params[:q], :include => :user, :match_mode => :boolean end end diff --git a/app/models/creation.rb b/app/models/creation.rb index 8ea51348..8119abb4 100644 --- a/app/models/creation.rb +++ b/app/models/creation.rb @@ -7,5 +7,6 @@ class Creation < ActiveRecord::Base define_index do indexes :name + indexes story end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c9ca7972..5818df5d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -21,7 +21,7 @@ <div class="search"> <% form_tag(search_index_path, :method => "get") do %> <div class="txt"> - <%= text_field_tag(:search) %> + <%= text_field_tag(:q) %> </div> <div class="searchBt"> <%= submit_tag("search") %> diff --git a/config/development.sphinx.conf b/config/development.sphinx.conf index 66a63135..8561c63f 100644 --- a/config/development.sphinx.conf +++ b/config/development.sphinx.conf @@ -18,7 +18,7 @@ source creation_core_0 sql_pass = password sql_db = cakeside_development sql_query_pre = SET TIME ZONE 'UTC' - sql_query = SELECT "creations"."id" * 1::INT8 + 0 AS "id" , "creations"."name" AS "name", "creations"."id" AS "sphinx_internal_id", 0 AS "sphinx_deleted", 2929256226 AS "class_crc" FROM "creations" WHERE ("creations"."id" >= $start AND "creations"."id" <= $end) GROUP BY "creations"."id", "creations"."name", "creations"."id" + sql_query = SELECT "creations"."id" * 1::INT8 + 0 AS "id" , "creations"."name" AS "name", "creations"."story" AS "story", "creations"."id" AS "sphinx_internal_id", 0 AS "sphinx_deleted", 2929256226 AS "class_crc" FROM "creations" WHERE ("creations"."id" >= $start AND "creations"."id" <= $end) GROUP BY "creations"."id", "creations"."name", "creations"."story", "creations"."id" sql_query_range = SELECT COALESCE(MIN("id"), 1::bigint), COALESCE(MAX("id"), 1::bigint) FROM "creations" sql_attr_uint = sphinx_internal_id sql_attr_uint = sphinx_deleted diff --git a/log/searchd.development.pid b/log/searchd.development.pid deleted file mode 100644 index 7593b893..00000000 --- a/log/searchd.development.pid +++ /dev/null @@ -1 +0,0 @@ -3794 |