From eccb090d5c5466a39328575847d21ba0118a8201 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 5 Sep 2015 15:03:11 +0200
Subject: [PATCH] AutoCommit Sam Sep  5 15:03:11 CEST 2015

---
 app/controllers/documents_controller.rb      | 2 +-
 app/views/documents/_search_results.html.erb | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index bacf9af..22361db 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -157,7 +157,7 @@ class DocumentsController < ApplicationController
       @results = Document.search do
         fulltext params['query'] do
           fields :name, :text, :meeting
-          highlight :text
+          highlight :text,:name,:meeting
         end
       end
       @res=[]
diff --git a/app/views/documents/_search_results.html.erb b/app/views/documents/_search_results.html.erb
index 1e1a655..1d72a50 100644
--- a/app/views/documents/_search_results.html.erb
+++ b/app/views/documents/_search_results.html.erb
@@ -5,15 +5,12 @@
 <ul>
 	<% search_results.each_hit_with_result  do |hit,result| %>
 		<li> <%= link_to result.parent.title+": " + result.name, document_path(result) %>
-			<div style="border:red 1px solid"><%= hit.highlights.to_yaml %></div>
-		<div style="border:blue 1px solid"><%#= hit.to_yaml %></div>
-
 			<%  hit.highlights(:name).each do |hlgt| %>
 				<%= (hlgt.format{|word|"<b>#{word}</b>" } ).html_safe%>
 			<% end 	%>
 			<%  %>
-			<%  hit.highlights(:text).each do |hlgt| %>
-				<%=  "text:" + (hlgt.format {|word| raw("<b>#{word}</b>") }).html_safe%> 
+			<%  hit.highlights(:text).each do |hlgt| %> 
+				<%=  ("<br>text: " + hlgt.format {|word| "<b>#{word}</b>" }).html_safe%> 
 			<%  end %>
 			<%  hit.highlights(:meeting).each do |hlgt| %>
 				<%=  "text:" + (hlgt.format {|word| "*#{word}*" }).html_safe%>