X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fsearch.rb;h=aec8b1345611a2994a23f711e3573664ed7c6f81;hb=8ff8b7068c315d10f5a77fc7952e0ccadf7805bc;hp=595dab3c732625a91144ff7ce995dd5c2ba1e747;hpb=7d51d43a4f03a7529f30ed71fa807e9279aec39a;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/search.rb b/data/rbot/plugins/search.rb
index 595dab3c..aec8b134 100644
--- a/data/rbot/plugins/search.rb
+++ b/data/rbot/plugins/search.rb
@@ -21,7 +21,7 @@ GOOGLE_WAP_SEARCH = "http://www.google.com/m/search?hl=en&q="
 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_COUNT_RESULT = %r{<font size=-1>Results <b>1<\/b> - <b>10<\/b> of about <b>(.*)<\/b> for}
-GOOGLE_DEF_RESULT = %r{<p> (Web definitions for .*?)<br/>(.*?)<br/>(.*?)\s-\s+<a href}
+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)>}
 
 class SearchPlugin < Plugin
@@ -59,6 +59,10 @@ class SearchPlugin < Plugin
 
   def google(m, params)
     what = params[:words].to_s
+    if what.match(/^define:/)
+      return google_define(m, what, params)
+    end
+
     searchfor = CGI.escape what
     # This method is also called by other methods to restrict searching to some sites
     if params[:site]
@@ -73,10 +77,11 @@ class SearchPlugin < Plugin
     url = GOOGLE_WAP_SEARCH + site + searchfor
 
     hits = params[:hits] || @bot.config['google.hits']
+    hits = 1 if params[:lucky]
 
     first_pars = params[:firstpar] || @bot.config['google.first_par']
 
-    single = (hits == 1 and first_pars == 1)
+    single = params[:lucky] || (hits == 1 and first_pars == 1)
 
     begin
       wml = @bot.httputil.get(url)
@@ -86,33 +91,42 @@ class SearchPlugin < Plugin
       return
     end
     results = wml.scan(GOOGLE_WAP_LINK)
+
     if results.length == 0
       m.reply "no results found for #{what}"
       return
     end
+
     single ||= (results.length==1)
+
     urls = Array.new
     n = 0
     results = results[0...hits].map { |res|
       n += 1
-      t = Utils.decode_html_entities res[2].gsub(filter, '').strip
+      t = res[2].ircify_html(:img => "[%{src} %{alt} %{dimensions}]").strip
       u = URI.unescape(res[0] || res[1])
       urls.push(u)
-      single ? u : "#{n}. #{Bold}#{t}#{Bold}: #{u}"
-    }.join(" | ")
+      "%{n}%{b}%{t}%{b}%{sep}%{u}" % {
+        :n => (single ? "" : "#{n}. "),
+        :sep => (single ? " -- " : ": "),
+        :b => Bold, :t => t, :u => u
+      }
+    }
 
     if params[:lucky]
-      m.reply urls.first
+      m.reply results.first
       return
     end
 
+    result_string = results.join(" | ")
+
     # 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)], :overlong => :truncate
+      m.reply "Result for %s: %s -- %s" % [what, result_string, Utils.get_first_pars(urls, first_pars)], :overlong => :truncate
       return
     end
 
-    m.reply "Results for #{what}: #{results}", :split_at => /\s+\|\s+/
+    m.reply "Results for #{what}: #{result_string}", :split_at => /\s+\|\s+/
 
     return unless first_pars > 0
 
@@ -120,6 +134,34 @@ class SearchPlugin < Plugin
 
   end
 
+  def google_define(m, what, params)
+    begin
+      wml = @bot.httputil.get(GOOGLE_SEARCH + CGI.escape(what))
+      raise unless wml
+    rescue => e
+      m.reply "error googling for #{what}"
+      return
+    end
+
+    begin
+      related_index = wml.index(/Related phrases:/, 0)
+      raise unless related_index
+      defs_index = wml.index(/Definitions of <b>/, related_index)
+      raise unless defs_index
+      defs_end = wml.index(/<input/, defs_index)
+      raise unless defs_end
+    rescue => e
+      m.reply "no results found for #{what}"
+      return
+    end
+
+    related = wml[related_index...defs_index]
+    defs = wml[defs_index...defs_end]
+
+    m.reply defs.ircify_html(:a_href => Underline), :split_at => (Underline + ' ')
+
+  end
+
   def lucky(m, params)
     params.merge!(:lucky => true)
     google(m, params)
@@ -207,10 +249,21 @@ class SearchPlugin < Plugin
       return
     end
 
-    head = results[0][0].ircify_html
-    text = results[0][1].ircify_html
-    link = results[0][2]
+    gdef_link = "http://www.google.com" + CGI.unescapeHTML(results[0][0]) # could be used to extract all defs
+    head = results[0][1].ircify_html
+    text = results[0][2].ircify_html
+    link = results[0][3]
     m.reply "#{head} -- #{link}\n#{text}"
+
+    ### gdef_link could be used for something like
+    # html_defs = @bot.httputil.get(gdef_link)
+    # related_index = html_defs.index(/Related phrases:/, 0)
+    # defs_index = html_defs.index(/Definitions of <b>/, related_index)
+
+    # related = html_defs[related_index..defs_index]
+    # defs = html_defs[defs_index..-1]
+
+    # m.reply defs.gsub('  <br/>','<li>').ircify_html
   end
 
   def wikipedia(m, params)