X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fsearch.rb;h=b2e950ecd544b81247e2f380dab041dfbaf125e8;hb=24bb60775741d3731400f1e430ef6bf3a2e1b933;hp=da6881f4d1de3a4d3114e7d7eb8b461f21e5316e;hpb=d8cc9bae30308fdaa767d2d4b9a070d1d5b6a2d5;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/search.rb b/data/rbot/plugins/search.rb
index da6881f4..b2e950ec 100644
--- a/data/rbot/plugins/search.rb
+++ b/data/rbot/plugins/search.rb
@@ -15,20 +15,23 @@
 # TODO:: support localized uncyclopedias -- not easy because they have different names
 #        for most languages
 
+GOOGLE_SEARCH = "http://www.google.com/search?oe=UTF-8&q="
+GOOGLE_WAP_SEARCH = "http://www.google.com/wml/search?hl=en&q="
 GOOGLE_WAP_LINK = /<a accesskey="(\d)" href=".*?u=(.*?)">(.*?)<\/a>/im
-GOOGLE_CALC_RESULT = %r{<p><table><tr><td><img src=/images/calc_img\.gif></td><td>&nbsp;</td><td nowrap><font size=\+1><b>(.+)</b></td></tr><tr><td>}
+GOOGLE_CALC_RESULT = %r{<img src=/images/calc_img\.gif(?: width=40 height=30 alt="")?></td><td>&nbsp;</td><td nowrap>(?:<h2 class=r>)?<font size=\+1><b>(.+)</b>(?:</h2>)?</td>}
+GOOGLE_DEF_RESULT = %r{<p> (Web definitions for .*?)<br/>(.*?)<br/>(.*?)\s-\s+<a href}
 
 class SearchPlugin < Plugin
-  BotConfig.register BotConfigIntegerValue.new('google.hits',
+  Config.register Config::IntegerValue.new('google.hits',
     :default => 3,
     :desc => "Number of hits to return from Google searches")
-  BotConfig.register BotConfigIntegerValue.new('google.first_par',
+  Config.register Config::IntegerValue.new('google.first_par',
     :default => 0,
     :desc => "When set to n > 0, the bot will return the first paragraph from the first n search hits")
-  BotConfig.register BotConfigIntegerValue.new('wikipedia.hits',
+  Config.register Config::IntegerValue.new('wikipedia.hits',
     :default => 3,
     :desc => "Number of hits to return from Wikipedia searches")
-  BotConfig.register BotConfigIntegerValue.new('wikipedia.first_par',
+  Config.register Config::IntegerValue.new('wikipedia.first_par',
     :default => 1,
     :desc => "When set to n > 0, the bot will return the first paragraph from the first n wikipedia search hits")
 
@@ -38,6 +41,8 @@ class SearchPlugin < Plugin
       "#{topic} <string> => search google for <string>"
     when "gcalc"
       "gcalc <equation> => use the google calculator to find the answer to <equation>"
+    when "gdef"
+      "gdef <term(s)> => use the google define mechanism to find a definition of <term(s)>"
     when "wp"
       "wp [<code>] <string> => search for <string> on Wikipedia. You can select a national <code> to only search the national Wikipedia"
     when "unpedia"
@@ -60,7 +65,7 @@ class SearchPlugin < Plugin
     # e.g.: "Wikipedia, the free encyclopedia" when doing Wikipedia searches
     filter = params[:filter] || ""
 
-    url = "http://www.google.com/wml/search?q=#{site}#{searchfor}"
+    url = GOOGLE_WAP_SEARCH + site + searchfor
 
     hits = params[:hits] || @bot.config['google.hits']
 
@@ -80,6 +85,7 @@ class SearchPlugin < Plugin
       m.reply "no results found for #{what}"
       return
     end
+    single ||= (results.length==1)
     urls = Array.new
     results = results[0...hits].map { |res|
       n = res[0]
@@ -91,7 +97,7 @@ class SearchPlugin < Plugin
 
     # If we return a single, full result, change the output to a more compact representation
     if single
-      m.reply "Result for %s: %s -- %s" % [what, results, Utils.get_first_pars(urls, first_pars)]
+      m.reply "Result for %s: %s -- %s" % [what, results, Utils.get_first_pars(urls, first_pars)], :overlong => :truncate
       return
     end
 
@@ -108,7 +114,7 @@ class SearchPlugin < Plugin
     searchfor = CGI.escape(what)
     
     debug "Getting gcalc thing: #{searchfor.inspect}"
-    url = "http://www.google.com/search?q=#{searchfor}"
+    url = GOOGLE_SEARCH + searchfor
 
     begin
       html = @bot.httputil.get(url)
@@ -132,6 +138,35 @@ class SearchPlugin < Plugin
     m.reply "#{result}"
   end
 
+  def gdef(m, params)
+    what = params[:words].to_s
+    searchfor = CGI.escape("define " + what)
+    
+    debug "Getting gdef thing: #{searchfor.inspect}"
+    url = GOOGLE_WAP_SEARCH + searchfor
+
+    begin
+      html = @bot.httputil.get(url)
+    rescue => e
+      m.reply "error googledefining #{what}"
+      return
+    end
+
+    debug html
+    results = html.scan(GOOGLE_DEF_RESULT)
+    debug "results: #{results.inspect}"
+    
+    if results.length != 1
+      m.reply "couldn't find a definition for #{what} on Google"
+      return
+    end
+    
+    head = results[0][0].ircify_html
+    text = results[0][1].ircify_html
+    link = results[0][2]
+    m.reply "#{head} -- #{link}\n#{text}"
+  end
+
   def wikipedia(m, params)
     lang = params[:lang]
     site = "#{lang.nil? ? '' : lang + '.'}wikipedia.org"
@@ -159,6 +194,7 @@ plugin = SearchPlugin.new
 plugin.map "search *words", :action => 'google'
 plugin.map "google *words", :action => 'google'
 plugin.map "gcalc *words", :action => 'gcalc'
+plugin.map "gdef *words", :action => 'gdef'
 plugin.map "wp :lang *words", :action => 'wikipedia', :requirements => { :lang => /^\w\w\w?$/ }
 plugin.map "wp *words", :action => 'wikipedia'
 plugin.map "unpedia *words", :action => 'unpedia'