diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-04-20 21:10:04 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-04-20 21:10:04 -0400 |
| commit | 0f740e9c185b6aaed05e193828545ce7664fdbec (patch) | |
| tree | d27e2672ad3a816c743ad65ac3de85e1eb237f46 /lib/sisu/v2/cgi_pgsql.rb | |
| parent | debian/changelog (3.0.6-1) (diff) | |
| parent | v2 v3: sisu-mode.el, header notes copyright assignment to FSF (GNU EMACS) (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v2/cgi_pgsql.rb')
| -rw-r--r-- | lib/sisu/v2/cgi_pgsql.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sisu/v2/cgi_pgsql.rb b/lib/sisu/v2/cgi_pgsql.rb index 416a7d88..2cac69f6 100644 --- a/lib/sisu/v2/cgi_pgsql.rb +++ b/lib/sisu/v2/cgi_pgsql.rb @@ -172,11 +172,11 @@ module SiSU_CGI_pgsql def search_query1 <<-'WOK_SQL' @search_text,@search_endnotes=[],[] - search[:text].each{|x| @search_text << "#{x} AND " } - @search_text=@search_text.join.gsub!(/AND\s+$/,'') #watch + search[:text].flatten.each {|x| @search_text << "#{x} AND " } + @search_text=@search_text.join.gsub!(/AND\s+$/m,'') #watch @search_text.gsub!(/(doc_objects\.clean~[*]?\(\s*'[^']+'\s*\)\s+(?:(?:AND|OR)\s+doc_objects\.clean~[*]?\(\s*'[^']+'\s*\))+)/,'(\1)') - search[:endnotes].each{|x| @search_endnotes << "#{x} AND " } - @search_endnotes=@search_endnotes.join.gsub!(/AND\s+$/,'') #watch + search[:endnotes].flatten.each{|x| @search_endnotes << "#{x} AND " } + @search_endnotes=@search_endnotes.join.gsub!(/AND\s+$/m,'') #watch @search_endnotes.gsub!(/(endnotes\.clean~\(\s*'[^']+'\s*\)\s+(?:(?:AND|OR)\s+endnotes\.clean~\(\s*'[^']+'\s*\))+)/,'(\1)') end WOK_SQL |