<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,7 +1,6 @@
 class SearchController &lt; ApplicationController
-  before_filter :deliver_results
-  
   def index
+    deliver_results
     respond_to do |wants| 
       wants.html
       wants.js
@@ -11,7 +10,8 @@ class SearchController &lt; ApplicationController
   
   def search
     @query = params[:q]
-    @results = [&quot;1&quot;, &quot;2&quot;, &quot;3&quot;]
+    @users = User.search(@query)
+    # @assets = Asset.search(@query)
     render :partial =&gt; &quot;results&quot;
   end
   </diff>
      <filename>app/controllers/search_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,20 +1,19 @@
-class User &lt; ActiveRecord::Base
-  define_index do
-    indexes :display_name, :login, :bio, :city, :country
-    has :created_at
-  end
-end
-
-
+##
+# Indexing
 class Asset &lt; ActiveRecord::Base
   define_index do
     indexes :title, :description, :filename, :lyrics
     indexes [user.display_name, user.login], :as =&gt; :user
-    indexes 
     has :created_at, :album, :genre, :artist
   end
 end
 
+class User &lt; ActiveRecord::Base
+  define_index do
+    indexes :display_name, :login, :bio, :city, :country
+    has :created_at
+  end
+end
 
 class Post &lt; ActiveRecord::Base
   define_index do
@@ -24,6 +23,8 @@ class Post &lt; ActiveRecord::Base
 end
 
 
+##
+# Searching
 class SphinxSearch
   def search(query)
     </diff>
      <filename>app/models/sphinx_search.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,2 +1,5 @@
 &lt;h3&gt;Results for &quot;&lt;%= h @query %&gt;&quot;&lt;/h3&gt;
-&lt;%= @results.join(&quot;&lt;br /&gt;&quot;) %&gt;
\ No newline at end of file
+
+&lt;%= render :partial =&gt; 'shared/user', :collection =&gt; @users unless @users.blank? %&gt;
+
+&lt;%= render :partial =&gt; 'assets/asset', :collection =&gt; @assets  unless @assets.blank? %&gt;</diff>
      <filename>app/views/search/_results.html.erb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>76211d4fd12cfe3e97da824245a2ff96205f5c6e</id>
    </parent>
  </parents>
  <author>
    <name>Tien Dung</name>
    <email>dungtn@gmail.com</email>
  </author>
  <url>http://github.com/tiendung/alonetone/commit/19b16019bcce566c2e2c2382dad0671f2cc27224</url>
  <id>19b16019bcce566c2e2c2382dad0671f2cc27224</id>
  <committed-date>2008-10-29T17:14:20-07:00</committed-date>
  <authored-date>2008-10-29T17:14:20-07:00</authored-date>
  <message>user /search?q=query to test sphinx search</message>
  <tree>6ca4de78a57b714367915c02de39b9420e25623a</tree>
  <committer>
    <name>Tien Dung</name>
    <email>dungtn@gmail.com</email>
  </committer>
</commit>
