7027856 · searx · git.iko.soy

git.iko.soy/searx

[mod] searching by selected engines

commit70278567ecacd1632dfdfdff6dbcc0f14a8fab02 authorasciimoo <asciimoo@gmail.com> dateMon 4 Nov 2013, 00:18 (13 years ago) parentd2a952e

2 files changed+12−10

compare with master

unifiedsplit

searx/engines/__init__.py+1−8 searx/webapp.py+11−2

searx/engines/__init__.py+1−8

@@ -97,20 +97,13 @@ def make_callback(engine_name, results, callback, params):

9797 results[engine_name] = cb_res

9898 return process_callback

9999

100−def search(query, request, selected_categories):

100+def search(query, request, selected_engines):

101101 global engines, categories, number_of_searches

102102 requests = []

103103 results = {}

104− selected_engines = []

105104 number_of_searches += 1

106105 user_agent = request.headers.get('User-Agent', '')

107106

108− if not len(selected_categories):

109− selected_categories = ['general']

110−

111− for categ in selected_categories:

112− selected_engines.extend({'category': categ, 'name': x.name} for x in categories[categ])

113−

114107 for selected_engine in selected_engines:

115108 if selected_engine['name'] not in engines:

116109 continue

searx/webapp.py+11−2

@@ -65,6 +65,9 @@ def index():

6565 request_data = request.args

6666 if not request_data.get('q'):

6767 return render('index.html')

68+

69+ query = request_data['q'].encode('utf-8')

70+

6871 selected_categories = []

6972 for pd_name,pd in request_data.items():

7073 if pd_name.startswith('category_'):

@@ -77,8 +80,14 @@ def index():

7780 for ccateg in cookie_categories:

7881 if ccateg in categories:

7982 selected_categories.append(ccateg)

80− query = request_data['q'].encode('utf-8')

81− results = search(query, request, selected_categories)

83+ if not len(selected_categories):

84+ selected_categories = ['general']

85+

86+ selected_engines = []

87+ for categ in selected_categories:

88+ selected_engines.extend({'category': categ, 'name': x.name} for x in categories[categ])

89+

90+ results = search(query, request, selected_engines)

8291 for result in results:

8392 if len(result['url']) > 74:

8493 result['pretty_url'] = result['url'][:35] + '[..]' + result['url'][-35:]