diff options
| author | Adam Tauber <asciimoo@gmail.com> | 2014-12-07 17:49:01 +0100 |
|---|---|---|
| committer | Adam Tauber <asciimoo@gmail.com> | 2014-12-07 17:49:01 +0100 |
| commit | 9517f7a6e775aded6f1673f4a991594b08750467 (patch) | |
| tree | 332019feae5a215d2d54528308792560794d7aa5 /searx/engines/faroo.py | |
| parent | 611f4e2a86a84b3d15bdaf6ef7435549ea86fcfa (diff) | |
| parent | 7c13d630e4531630ce3c392a7d60752715742291 (diff) | |
Merge pull request #139 from dalf/master
pep8 : engines
Diffstat (limited to 'searx/engines/faroo.py')
| -rw-r--r-- | searx/engines/faroo.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/searx/engines/faroo.py b/searx/engines/faroo.py index 8c69c5bee..dada4758d 100644 --- a/searx/engines/faroo.py +++ b/searx/engines/faroo.py @@ -1,8 +1,8 @@ ## Faroo (Web, News) -# +# # @website http://www.faroo.com # @provide-api yes (http://www.faroo.com/hp/api/api.html), require API-key -# +# # @using-api yes # @results JSON # @stable yes @@ -24,9 +24,10 @@ api_key = None url = 'http://www.faroo.com/' search_url = url + 'api?{query}&start={offset}&length={number_of_results}&l={language}&src={categorie}&i=false&f=json&key={api_key}' -search_category = {'general': 'web', +search_category = {'general': 'web', 'news': 'news'} + # do search-request def request(query, params): offset = (params['pageno']-1) * number_of_results + 1 @@ -48,7 +49,7 @@ def request(query, params): query=urlencode({'q': query}), language=language, categorie=categorie, - api_key=api_key ) + api_key=api_key) # using searx User-Agent params['headers']['User-Agent'] = searx_useragent() @@ -101,7 +102,7 @@ def response(resp): results.append({'template': 'images.html', 'url': result['url'], 'title': result['title'], - 'content': result['kwic'], + 'content': result['kwic'], 'img_src': result['iurl']}) # return results |