X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fsearch.rb;h=e6803e58bfe8095250ec0ea8effa390411f335ff;hb=6cf365c49ce5fbe24c0a4ff0663550390b501fea;hp=fdd9722abdded51860f008b805004cbfef23f586;hpb=259e147cdfdda54db4d2a2ee3162a0de9b0e1f73;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/data/rbot/plugins/search.rb b/data/rbot/plugins/search.rb index fdd9722a..e6803e58 100644 --- a/data/rbot/plugins/search.rb +++ b/data/rbot/plugins/search.rb @@ -24,6 +24,10 @@ GOOGLE_DEF_RESULT = %r{onebox_result">\s*(.*?)\s*
\s*(.*?)]+>(.+?)<(br|/td)>} DDG_API_SEARCH = "http://api.duckduckgo.com/?format=xml&no_html=1&skip_disambig=1&no_redirect=0&q=" + +WOLFRAM_API_SEARCH = "http://api.wolframalpha.com/v2/query?input=%{terms}&appid=%{key}&format=plaintext" + + "&scantimeout=3.0&podtimeout=4.0&formattimeout=8.0&parsetimeout=5.0" + + "&excludepodid=SeriesRepresentations:*" WOLFRAM_API_KEY = "4EU37Y-TX9WJG3JH3" class SearchPlugin < Plugin @@ -94,15 +98,28 @@ class SearchPlugin < Plugin answer = xml.elements['//Answer/text()'].to_s # abstract is returned for definitions etc abstract = xml.elements['//AbstractText/text()'].to_s + abfrom = "" unless abstract.empty? - absrc = xml.elements['//AbstractSource/text()'] - aburl = xml.elements['//AbstractURL/text()'] + absrc = xml.elements['//AbstractSource/text()'].to_s + aburl = xml.elements['//AbstractURL/text()'].to_s + unless absrc.empty? and aburl.empty? + abfrom = " --" + abfrom << " " << absrc unless absrc.empty? + abfrom << " " << aburl unless aburl.empty? + end end + # but also definition (yes, you can have both, see e.g. printf) definition = xml.elements['//Definition/text()'].to_s + deffrom = "" unless definition.empty? defsrc = xml.elements['//Definition/@source/text()'].to_s defurl = xml.elements['//Definition/@url/text()'].to_s + unless defsrc.empty? and defurl.empty? + deffrom = " --" + deffrom << " " << defsrc unless defsrc.empty? + deffrom << " " << defurl unless defurl.empty? + end end if heading.empty? and answer.empty? and abstract.empty? and definition.empty? @@ -118,15 +135,15 @@ class SearchPlugin < Plugin # otherwise, return the abstract, followed by as many hits as found unless heading.empty? or abstract.empty? - m.reply "%{bold}%{heading}:%{bold} %{abstract} -- %{absrc} %{aburl}" % { + m.reply "%{bold}%{heading}:%{bold} %{abstract}%{abfrom}" % { :bold => Bold, :heading => heading, - :abstract => abstract, :absrc => absrc, :aburl => aburl + :abstract => abstract, :abfrom => abfrom } end unless heading.empty? or definition.empty? - m.reply "%{bold}%{heading}:%{bold} %{abstract} -- %{absrc} %{aburl}" % { + m.reply "%{bold}%{heading}:%{bold} %{abstract}%{abfrom}" % { :bold => Bold, :heading => heading, - :abstract => definition, :absrc => defsrc, :aburl => defurl + :abstract => definition, :abfrom => deffrom } end # return zeroclick search results @@ -390,15 +407,21 @@ class SearchPlugin < Plugin end def wolfram(m, params) - terms = CGI.escape(params[:words].to_s) - feed = Net::HTTP.get 'api.wolframalpha.com', - "/v2/query?input=#{terms}&appid=#{WOLFRAM_API_KEY}&format=plaintext" - "&scantimeout=3.0&podtimeout=4.0&formattimeout=8.0&parsetimeout=5.0" - "&excludepodid=SeriesRepresentations:*" - if feed.nil? or feed.empty? - m.reply "error connecting" + what = params[:words].to_s + terms = CGI.escape what + url = WOLFRAM_API_SEARCH % { + :terms => terms, :key => WOLFRAM_API_KEY + } + + begin + feed = @bot.httputil.get(url) + raise unless feed + rescue => e + m.reply "error asking WolframAlfa about #{what}" return end + debug feed + xml = REXML::Document.new feed if xml.elements['/queryresult'].attributes['error'] == "true" m.reply xml.elements['/queryresult/error/text()'].to_s @@ -408,15 +431,27 @@ class SearchPlugin < Plugin m.reply "no data available" return end - answer = [] - xml.elements.each("//pod/subpod/plaintext") { |element| - answer << element.text + answer_type, answer = [], [] + xml.elements.each("//pod") { |element| + answer_type << element.attributes['title'] + answer << element.elements['subpod/plaintext'].text + } + # find the first answer that isn't nil, + # starting on the second pod in the array + n = 1 + answer[1..-1].each { |a| + break unless a.nil? + n += 1 } - # strip spaces and line breaks - answer[1].gsub!(/\n/, Bold + ' :: ' + Bold ) - answer[1].gsub!(/\t/, ' ') - answer[1].gsub!(/\s+/, ' ') - m.reply answer[1].to_s + if answer[n].nil? + m.reply "no results" + return + end + # strip spaces, pipes, and line breaks + sep = Bold + ' :: ' + Bold + chars = [ [/\n/, sep], [/\t/, " "], [/\s+/, " "], ["|", "-"] ] + chars.each { |c| answer[n].gsub!(c[0], c[1]) } + m.reply answer_type[n] + sep + answer[n] end def wikipedia(m, params) @@ -469,7 +504,7 @@ end plugin = SearchPlugin.new -plugin.map "ddg *words", :action => 'duckduckgo' +plugin.map "ddg *words", :action => 'duckduckgo', :threaded => true plugin.map "search *words", :action => 'google', :threaded => true plugin.map "google *words", :action => 'google', :threaded => true plugin.map "lucky *words", :action => 'lucky', :threaded => true @@ -477,7 +512,7 @@ plugin.map "gcount *words", :action => 'gcount', :threaded => true plugin.map "gcalc *words", :action => 'gcalc', :threaded => true plugin.map "gdef *words", :action => 'gdef', :threaded => true plugin.map "gtime *words", :action => 'gtime', :threaded => true -plugin.map "wa *words", :action => 'wolfram' +plugin.map "wa *words", :action => 'wolfram', :threaded => true plugin.map "wp :lang *words", :action => 'wikipedia', :requirements => { :lang => /^\w\w\w?$/ }, :threaded => true plugin.map "wp *words", :action => 'wikipedia', :threaded => true plugin.map "unpedia *words", :action => 'unpedia', :threaded => true