quiz: stop quizzes and timers on cleanup

[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 8b3b6848d11800084a22ac93a9b64d3c13802207..4e13f3e7f7ec7dd9d539a655f5b56400fc48afbe 100644 (file)
--- a/data/rbot/plugins/search.rb
+++ b/data/rbot/plugins/search.rb
@@ -19,7 +19,7 @@ GOOGLE_SEARCH = "http://www.google.com/search?oe=UTF-8&q="
 GOOGLE_WAP_SEARCH = "http://www.google.com/m/search?hl=en&q="
 # GOOGLE_WAP_LINK = /<a accesskey="(\d)" href=".*?u=(.*?)">(.*?)<\/a>/im
 GOOGLE_WAP_LINK = /<a href="(?:.*?u=(.*?)|(http:\/\/.*?))">(.*?)<\/a>/im
-GOOGLE_CALC_RESULT = %r{<img src=/images/calc_img\.gif(?: width=40 height=30 alt="")?>.*?<h2 class=r[^>]*><b>(.+?)</b>}
+GOOGLE_CALC_RESULT = %r{<img src=/images/calc_img\.gif(?: width=40 height=30 alt="")?>.*?<h[1-6] class=r[^>]*><b>(.+?)</b>}
 GOOGLE_COUNT_RESULT = %r{<font size=-1>Results <b>1<\/b> - <b>10<\/b> of about <b>(.*)<\/b> for}
 GOOGLE_DEF_RESULT = %r{<a href="([^"]*)"[^>]*>(Web definitions for .*?)<br/>(.*?)<br/>(.*?)\s-\s+<a href}
 GOOGLE_TIME_RESULT = %r{alt="Clock"></td><td valign=[^>]+>(.+?)<(br|/td)>}
@@ -172,7 +172,7 @@ class SearchPlugin < Plugin
     searchfor = CGI.escape(what)
 
     debug "Getting gcalc thing: #{searchfor.inspect}"
-    url = GOOGLE_SEARCH + searchfor
+    url = GOOGLE_WAP_SEARCH + searchfor
 
     begin
       html = @bot.httputil.get(url)
@@ -183,17 +183,16 @@ class SearchPlugin < Plugin
 
     debug "#{html.size} bytes of html recieved"
 
-    results = html.scan(GOOGLE_CALC_RESULT)
-    debug "results: #{results.inspect}"
+    intro, result, junk = html.split(/\s*<br\/>\s*/, 3)
+    debug "result: #{result.inspect}"
 
-    if results.length != 1
+    unless result.include? '='
       m.reply "couldn't calculate #{what}"
       return
     end
 
-    result = results[0][0].ircify_html
     debug "replying with: #{result.inspect}"
-    m.reply "#{result}"
+    m.reply result.ircify_html
   end
 
   def gcount(m, params)