rss plugin: parse feed on first retrieval; add some more debug

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / search.rb

diff --git a/data/rbot/plugins/search.rb b/data/rbot/plugins/search.rb
index da98dd08d1915cccc5e0152db4d0744061c8ef26..c733c815fd03481b1b5a2451437f3a9e9a6ea852 100644 (file)
--- a/data/rbot/plugins/search.rb
+++ b/data/rbot/plugins/search.rb
@@ -45,7 +45,7 @@ class SearchPlugin < Plugin
 
   def google(m, params)
     what = params[:words].to_s
-    searchfor = URI.escape what
+    searchfor = CGI.escape what
     # This method is also called by other methods to restrict searching to some sites
     if params[:site]
       site = "site:#{params[:site]}+"
@@ -93,7 +93,7 @@ class SearchPlugin < Plugin
 
   def gcalc(m, params)
     what = params[:words].to_s
-    searchfor = URI.escape(what).sub('+','%2B')
+    searchfor = CGI.escape(what)
     
     debug "Getting gcalc thing: #{searchfor.inspect}"
     url = "http://www.google.com/search?q=#{searchfor}"