X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fsearch.rb;h=3cd45fe526b01b57c0615ff7daf3323b1b8ae3cf;hb=76308815c268c6f7d13a31594da8b9709d17564b;hp=ca4a90e8e5fd99e9219ab6d4abece464ecb82033;hpb=5595e355d736256d3dfe923aa12e56d6b3d9622e;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/search.rb b/data/rbot/plugins/search.rb
index ca4a90e8..3cd45fe5 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"
 
@@ -98,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?
@@ -122,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
@@ -479,7 +492,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
@@ -487,7 +500,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