Wikipedia (en and ru).

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

diff --git a/phd_pp.py b/phd_pp.py
index 603211a9918a6c1fb5300f0cf5a093a8426bb147..64df5196ef3be6e232cd584853c4d927d85655f4 100644 (file)
--- a/phd_pp.py
+++ b/phd_pp.py
@@ -93,7 +93,17 @@ class phd_pp(Template):
 <a href="%(img_name)s-800x600.jpg">800x600</a>, <a href="%(img_name)s-1024x800.jpg">1024x800</a>""" % {"img_name": img_name}
 
    def google_ru(self, query):
-      return "http://www.google.ru/search?hl=ru&ie=utf-8&oe=utf-8&q=%s" % urllib.quote_plus(unicode(query, "koi8-r").encode("utf-8"))
+      return "http://www.google.ru/search?hl=ru&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
 
    def yandex(self, query):
-      return "http://www.yandex.ru/yandsearch?text=%s&rpt=rad" % urllib.quote_plus(unicode(query, "koi8-r").encode("cp1251"))
+      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)
+
+   def wikipedia_ru(self, query):
+      return "http://ru.wikipedia.org/wiki/%s" % quote_string(query)
+
+
+def quote_string(s, to_encoding="utf-8"):
+   return urllib.quote_plus(unicode(s, "koi8-r").encode(to_encoding))