diff options
author | Noémi Ványi <sitbackandwait@gmail.com> | 2017-11-01 12:28:18 +0100 |
---|---|---|
committer | Noémi Ványi <sitbackandwait@gmail.com> | 2017-11-01 14:22:22 +0100 |
commit | 9c2b7a82f0c515fd1df88ed80349eda7f49e0825 (patch) | |
tree | e768c70adaec321bd2481f657afb8f6ffbbadea0 | |
parent | e391b2d970a19cdc39dd550929e91ace4aee8832 (diff) | |
download | searxng-9c2b7a82f0c515fd1df88ed80349eda7f49e0825.tar.gz searxng-9c2b7a82f0c515fd1df88ed80349eda7f49e0825.zip |
minor fixes of arxiv
Closes #1050
-rw-r--r-- | searx/engines/arxiv.py | 11 | ||||
-rw-r--r-- | tests/unit/engines/test_arxiv.py | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/searx/engines/arxiv.py b/searx/engines/arxiv.py index 826b77690..5ef84f0c1 100644 --- a/searx/engines/arxiv.py +++ b/searx/engines/arxiv.py @@ -2,7 +2,7 @@ """ ArXiV (Scientific preprints) - @website https://axiv.org + @website https://arxiv.org @provide-api yes (export.arxiv.org/api/query) @using-api yes @results XML-RSS @@ -41,7 +41,8 @@ def request(query, params): def response(resp): results = [] - search_results = html.fromstring(resp.text).xpath('//entry') + dom = html.fromstring(resp.content) + search_results = dom.xpath('//entry') for entry in search_results: title = entry.xpath('.//title')[0].text @@ -49,15 +50,15 @@ def response(resp): url = entry.xpath('.//id')[0].text content_string = '{doi_content}{abstract_content}' - + abstract = entry.xpath('.//summary')[0].text # If a doi is available, add it to the snipppet try: doi_content = entry.xpath('.//link[@title="doi"]')[0].text - content = content_string.format(doi_content=doi_content, abstract_content=abstract_content) + content = content_string.format(doi_content=doi_content, abstract_content=abstract) except: - content = content_string.format(abstract_content=abstract_content) + content = content_string.format(doi_content="", abstract_content=abstract) if len(content) > 300: content = content[0:300] + "..." diff --git a/tests/unit/engines/test_arxiv.py b/tests/unit/engines/test_arxiv.py index e51d0f483..b32c0e605 100644 --- a/tests/unit/engines/test_arxiv.py +++ b/tests/unit/engines/test_arxiv.py @@ -21,11 +21,11 @@ class TestBaseEngine(SearxTestCase): self.assertRaises(AttributeError, arxiv.response, '') self.assertRaises(AttributeError, arxiv.response, '[]') - response = mock.Mock(text='''<?xml version="1.0" encoding="UTF-8"?> + response = mock.Mock(content=b'''<?xml version="1.0" encoding="UTF-8"?> <feed xmlns="http://www.w3.org/2005/Atom"></feed>''') self.assertEqual(arxiv.response(response), []) - xml_mock = '''<?xml version="1.0" encoding="UTF-8"?> + xml_mock = b'''<?xml version="1.0" encoding="UTF-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="html">ArXiv Query: search_query=all:test_query&id_list=&start=0&max_results=1</title> <id>http://arxiv.org/api/1</id> @@ -50,7 +50,7 @@ class TestBaseEngine(SearxTestCase): </feed> ''' - response = mock.Mock(text=xml_mock.encode('utf-8')) + response = mock.Mock(content=xml_mock) results = arxiv.response(response) self.assertEqual(type(results), list) self.assertEqual(len(results), 1) |