diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/incoming_message.rb | 9 | ||||
| -rw-r--r-- | app/models/info_request.rb | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 02256805e..20f7ac7e4 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -18,7 +18,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: incoming_message.rb,v 1.49 2008-03-06 01:23:38 francis Exp $ +# $Id: incoming_message.rb,v 1.50 2008-03-06 20:10:29 francis Exp $ # TODO @@ -50,7 +50,7 @@ class IncomingMessage < ActiveRecord::Base has_many :outgoing_message_followups, :class_name => OutgoingMessage - acts_as_solr :fields => [ :get_main_body_text ], :if => "$do_solr_index" + acts_as_solr :fields => [ :get_text_for_indexing ], :if => "$do_solr_index" # Return the structured TMail::Mail object # Documentation at http://i.loveruby.net/en/projects/tmail/doc/ @@ -273,6 +273,11 @@ class IncomingMessage < ActiveRecord::Base text = IncomingMessage.remove_quoted_sections(text, "") end + # Returns text for indexing + def get_text_for_indexing + return get_body_for_quoting() + end + # Returns the name of the person the incoming message is from, or nil if there isn't one # or if there is only an email address. def safe_mail_from diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 89f5c8259..9bff40a60 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -21,7 +21,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: info_request.rb,v 1.56 2008-03-06 19:05:42 francis Exp $ +# $Id: info_request.rb,v 1.57 2008-03-06 20:10:29 francis Exp $ require 'digest/sha1' @@ -362,7 +362,8 @@ public if outgoing_messages.empty? # mainly for use with incomplete fixtures return "" end - excerpt = outgoing_messages[0].body + messages = self.outgoing_messages.find(:all, :order => "created_at") + excerpt = messages[0].body excerpt.sub!(/Dear .+,/, "") return excerpt end |