From 1f5cfa04d8c85aba7887fb46c3abd2bf99ddcd3b Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Fri, 2 Jul 2010 12:33:59 +0000 Subject: [PATCH] Made Nigma the default search engine. git-svn-id: file:///home/phd/archive/SVN/phdru.name/scripts@101 7bb0bf08-9e0d-0410-b083-99cee3bf18b8 --- phd_pp.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) 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): %(img_name)s-thumbnail.jpg
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) -- 2.39.2