]+>(.+?)<(br|/td)>}
class SearchPlugin < Plugin
@@ -90,7 +89,7 @@ class SearchPlugin < Plugin
m.reply "error googling for #{what}"
return
end
- results = wml.match(' ').pre_match.scan(GOOGLE_WAP_LINK)
+ results = wml.scan(GOOGLE_WAP_LINK)
if results.length == 0
m.reply "no results found for #{what}"
@@ -98,27 +97,46 @@ class SearchPlugin < Plugin
end
single ||= (results.length==1)
+ pretty = []
- urls = Array.new
- n = 0
- results = results[0...hits].map { |res|
- n += 1
- t = res[2].ircify_html(:img => "[%{src} %{alt} %{dimensions}]").strip
- u = URI.unescape(res[0] || res[1])
- urls.push(u)
- "%{n}%{b}%{t}%{b}%{sep}%{u}" % {
- :n => (single ? "" : "#{n}. "),
- :sep => (single ? " -- " : ": "),
- :b => Bold, :t => t, :u => u
- }
- }
+ begin
+ urls = Array.new
+
+ debug results
+ results.each do |res|
+ t = res[1].ircify_html(:img => "[%{src} %{alt} %{dimensions}]").strip
+ u = res[0]
+ if u.sub!(%r{^http://www.google.com/aclk\?},'')
+ u = CGI::parse(u)['adurl'].first
+ debug "skipping ad for #{u}"
+ next
+ elsif u.sub!(%r{^http://www.google.com/gwt/x\?},'')
+ u = CGI::parse(u)['u'].first
+ elsif u.sub!(%r{^/url\?},'')
+ u = CGI::parse(u)['q'].first
+ end
+ urls.push(u)
+ pretty.push("%{n}%{b}%{t}%{b}%{sep}%{u}" % {
+ :n => (single ? "" : "#{urls.length}. "),
+ :sep => (single ? " -- " : ": "),
+ :b => Bold, :t => t, :u => u
+ })
+ break if urls.length == hits
+ end
+ rescue => e
+ m.reply "failed to understand what google found for #{what}"
+ error e
+ debug wml
+ debug results
+ return
+ end
if params[:lucky]
- m.reply results.first
+ m.reply pretty.first
return
end
- result_string = results.join(" | ")
+ result_string = pretty.join(" | ")
# If we return a single, full result, change the output to a more compact representation
if single
@@ -182,16 +200,16 @@ class SearchPlugin < Plugin
end
debug "#{html.size} bytes of html recieved"
+ debug html
- splits = html.split(/\s* |