commit b3e88795b6abf927b0c905b01b421e28da83bdb4
parent 202c29073a9dfa21828f827ea2e059ff682efd0d
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Mon, 25 Feb 2008 09:06:25 -0800
Merge branch 'remove-normalization' into next
Diffstat:
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/lib/sup/index.rb b/lib/sup/index.rb
@@ -408,18 +408,7 @@ protected
def parse_user_query_string s
extraopts = {}
- ## this is a little hacky, but it works, at least until ferret changes
- ## its api. we parse the user query string with ferret twice: the first
- ## time we just turn the resulting object back into a string, which has
- ## the next effect of transforming the original string into a nice
- ## normalized form with + and - instead of AND, OR, etc. then we do some
- ## string substitutions which depend on this normalized form, re-parse
- ## the string with Ferret, and return the resulting query object.
-
- norms = @qparser.parse(s).to_s
- Redwood::log "normalized #{s.inspect} to #{norms.inspect}" unless s == norms
-
- subs = norms.gsub(/\b(to|from):(\S+)\b/) do
+ subs = s.gsub(/\b(to|from):(\S+)\b/) do
field, name = $1, $2
if(p = ContactManager.contact_for(name))
[field, p.email]
@@ -489,7 +478,6 @@ protected
subs = nil if chronic_failure
end
- Redwood::log "translated #{norms.inspect} to #{subs.inspect}" unless subs == norms
if subs
[@qparser.parse(subs), extraopts]
else