reduced instanciated AR objects for search

3 files changed, 8 insertions, 7 deletions

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 97ecdfd..ea545b7 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -3,8 +3,7 @@ class SearchController < ApplicationController
     @page = Page.new
     search_term = params[:search_term]
     if search_term and not search_term.empty?
-      nodes = Node.search(params[:search_term])
-      @results = nodes.map {|node| node.head}
+      @results = Node.search(params[:search_term], :include => :head)
     end
   end
 
diff --git a/app/views/search/_search_result.html.erb b/app/views/search/_search_result.html.erb
new file mode 100644
index 0000000..b480f89
--- /dev/null
+++ b/app/views/search/_search_result.html.erb
@@ -0,0 +1,4 @@
+<div class="article_partial">
+  <h2 class="headline"><%= link_to node.head.title, content_path(node.unique_path) %></h2>
+  <p class="excerpt"><%= node.head.abstract %></p>
+</div>
\ No newline at end of file
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 4c609a3..9824b8f 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -1,13 +1,11 @@
-<h2>Suche</h2>
-
 <% if params[:search_term] %>
-  <h3>Suchergebnisse für Suchbegriff: <%=h params[:search_term] %></h3>
+  <h2>Suchergebnisse für Suchbegriff: <%=h params[:search_term] %></h2>
 <% end %>
 
 <%= 
   render(
-    :partial => 'custom/partials/article',
+    :partial => 'search_result',
     :collection => @results,
-    :as => :page
+    :as => :node
   )
 %>
\ No newline at end of file