X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=phd_pp.py;h=d731d38a270fe9d13d8c8e8337aefb6d5ed78e3a;hb=b8b66716173b9f3339db879a940a3ceb9ed91330;hp=80331b05c91025397253bc5cb3e8467592931deb;hpb=37e27a836a08c1746612101ad128431ab95baafe;p=phdru.name%2Fphdru.name.git
diff --git a/phd_pp.py b/phd_pp.py
index 80331b0..d731d38 100644
--- a/phd_pp.py
+++ b/phd_pp.py
@@ -85,20 +85,25 @@ class phd_pp(Template):
800x600, 1024x800""" % {"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)