X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/fb8a270fa22abc217efc471d860c76d5a2352c61..6ccf44d39e1dac86792c148fef95c76c6e8a588e:/philo/contrib/sobol/search.py diff --git a/philo/contrib/sobol/search.py b/philo/contrib/sobol/search.py index 39b93c7..f1a2c6b 100644 --- a/philo/contrib/sobol/search.py +++ b/philo/contrib/sobol/search.py @@ -1,4 +1,5 @@ #encoding: utf-8 +import datetime from django.conf import settings from django.contrib.sites.models import Site @@ -9,12 +10,16 @@ from django.utils.http import urlquote_plus from django.utils.safestring import mark_safe from django.utils.text import capfirst from django.template import loader, Context, Template -import datetime + from philo.contrib.sobol.utils import make_tracking_querydict -try: - from eventlet.green import urllib2 -except: + +if getattr(settings, 'SOBOL_USE_EVENTLET', False): + try: + from eventlet.green import urllib2 + except: + import urllib2 +else: import urllib2 @@ -110,7 +115,8 @@ class Result(object): context = self.get_extra_context() context.update({ 'title': self.get_title(), - 'url': self.get_url() + 'url': self.get_url(), + 'result': self.result }) return context @@ -350,9 +356,6 @@ class GoogleSearch(JSONSearch): def get_result_url(self, result): return result['unescapedUrl'] - - def get_result_extra_context(self, result): - return result registry.register(GoogleSearch)