search plugin: enhance 'lucky' output

[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 cf74e0e37b5e42357304eb380fb76d2dee28d4c7..5745a24be6c9cf7443c23778347316fdf4319251 100644 (file)
--- a/data/rbot/plugins/search.rb
+++ b/data/rbot/plugins/search.rb
@@ -16,8 +16,9 @@
 #        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_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_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}
@@ -72,10 +73,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)
@@ -91,16 +93,21 @@ class SearchPlugin < Plugin
     end
     single ||= (results.length==1)
     urls = Array.new
+    n = 0
     results = results[0...hits].map { |res|
-      n = res[0]
+      n += 1
       t = Utils.decode_html_entities res[2].gsub(filter, '').strip
-      u = URI.unescape res[1]
+      u = URI.unescape(res[0] || res[1])
       urls.push(u)
-      single ? u : "#{n}. #{Bold}#{t}#{Bold}: #{u}"
+      "%{n}%{b}%{t}%{b}%{sep}%{u}" % {
+        :n => (single ? "" : "#{n}. "),
+        :sep => (single ? " -- " : ": "),
+        :b => Bold, :t => t, :u => u
+      }
     }.join(" | ")
 
     if params[:lucky]
-      m.reply urls.first
+      m.reply results.first
       return
     end