diff options
author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2007-02-06 16:46:54 +0000 |
---|---|---|
committer | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2007-02-06 16:46:54 +0000 |
commit | bcacf025a0d2cbba181ad3e55fba30926286f9c8 (patch) | |
tree | 587e32335e8c2e1ddfc3393ebceb136653bf0638 /data/rbot/plugins/search.rb | |
parent | d845911e2e16734f1dffb9f5747bd87233824204 (diff) |
Move code to get first par from a series of urls from search plugin to Utils, and use it in dict plugin too
Diffstat (limited to 'data/rbot/plugins/search.rb')
-rw-r--r-- | data/rbot/plugins/search.rb | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/data/rbot/plugins/search.rb b/data/rbot/plugins/search.rb index e94661b0..a10853bf 100644 --- a/data/rbot/plugins/search.rb +++ b/data/rbot/plugins/search.rb @@ -1,3 +1,7 @@ +# vim: set sw=2 et: +# +# TODO: use lr=lang_<code> or whatever is most appropriate to let google know +# it shouldn't use the bot's location to find the preferred language require 'uri' Net::HTTP.version_1_2 @@ -70,28 +74,8 @@ class SearchPlugin < Plugin first_pars = params[:firstpar] || @bot.config['google.first_par'] - idx = 0 - while first_pars > 0 and urls.length > 0 - url.replace(urls.shift) - idx += 1 - - # FIXME what happens if some big file is returned? We should share - # code with the url plugin to only retrieve partial file content! - xml = @bot.httputil.get_cached(url) - if xml.nil? - debug "Unable to retrieve #{url}" - next - end - par = Utils.ircify_first_html_par(xml) - if par.empty? - debug "No first par found\n#{xml}" - # FIXME only do this if the 'url' plugin is loaded - par = @bot.plugins['url'].get_title_from_html(xml) - next if par.empty? - end - m.reply "[#{idx}] #{par}", :overlong => :truncate - first_pars -=1 - end + Utils.get_first_pars urls, first_pars, :http_util => @bot.httputil, :message => m + end def wikipedia(m, params) |