Made Nigma the default search engine.

git-svn-id: file:///home/phd/archive/SVN/phdru.name/scripts@101 7bb0bf08-9e0d-0410-b083-99cee3bf18b8

diff --git a/phd_pp.py b/phd_pp.py
index 80331b05c91025397253bc5cb3e8467592931deb..d731d38a270fe9d13d8c8e8337aefb6d5ed78e3a 100644 (file)
--- a/phd_pp.py
+++ b/phd_pp.py
@@ -85,20 +85,25 @@ class phd_pp(Template):
 <img src="%(img_name)s-thumbnail.jpg" alt="%(img_name)s-thumbnail.jpg" /><br />
 <a href="%(img_name)s-800x600.jpg">800x600</a>, <a href="%(img_name)s-1024x800.jpg">1024x800</a>""" % {"img_name": img_name}
 
-   def google(self, query):
-      return "http://www.google.com/search?hl=en&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
+   def wikipedia(self, query):
+      return "http://en.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
 
-   def google_ru(self, query):
-      return "http://www.google.ru/search?hl=ru&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
+   def wikipedia_ru(self, query):
+      return "http://ru.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+
+   def nigma(self, query):
+       return "http://www.nigma.ru/index.php?s=%s" % quote_string(query)
+
+   search = nigma
 
    def yandex(self, query):
       return "http://www.yandex.ru/yandsearch?text=%s&rpt=rad" % quote_string(query, "cp1251")
 
-   def wikipedia(self, query):
-      return "http://en.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+   def google(self, query):
+      return "http://www.google.com/search?hl=en&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
 
-   def wikipedia_ru(self, query):
-      return "http://ru.wikipedia.org/wiki/%s" % quote_string(query.replace(' ', '_'), ext_safe=',')
+   def google_ru(self, query):
+      return "http://www.google.ru/search?hl=ru&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
 
 def quote_string(s, to_encoding="utf-8", ext_safe=''):
    return urllib.quote(unicode(s, "koi8-r").encode(to_encoding), '/' + ext_safe)