X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fsearch.rb;h=e6803e58bfe8095250ec0ea8effa390411f335ff;hb=6cf365c49ce5fbe24c0a4ff0663550390b501fea;hp=a4c4a89c4aec0388fa697d80561fd40b51b79cd5;hpb=983ad7a177ddb05519ff09b68d7bbf03bf9830a5;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/search.rb b/data/rbot/plugins/search.rb
index a4c4a89c..e6803e58 100644
--- a/data/rbot/plugins/search.rb
+++ b/data/rbot/plugins/search.rb
@@ -25,8 +25,8 @@ GOOGLE_TIME_RESULT = %r{alt="Clock"></td><td valign=[^>]+>(.+?)<(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"
+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"
 
@@ -431,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
     }
-    # 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
+    # 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
+    }
+    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)