logo

searx

Unnamed repository; edit this file 'description' to name the repository.
commit: 66f48c2bf5b84f6f7b52b1ba7217a1aadf5717b7
parent: 44c7eac958ea01d981ed4e31e10f51d9059f7945
Author: Adam Tauber <asciimoo@gmail.com>
Date:   Sun, 10 Jan 2016 18:49:50 +0100

[fix] google markup change - closes #489

Diffstat:

searx/engines/google.py | 4++--
searx/tests/engines/test_google.py | 20++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/searx/engines/google.py b/searx/engines/google.py @@ -90,7 +90,7 @@ url_map = 'https://www.openstreetmap.org/'\ search_path = '/search' search_url = ('https://{hostname}' + search_path + - '?{query}&start={offset}&gbv=1&gws_rd=cr') + '?{query}&start={offset}&gbv=1&gws_rd=ssl') # other URLs map_hostname_start = 'maps.google.' @@ -99,7 +99,7 @@ redirect_path = '/url' images_path = '/images' # specific xpath variables -results_xpath = '//li[@class="g"]' +results_xpath = '//div[@class="g"]' url_xpath = './/h3/a/@href' title_xpath = './/h3' content_xpath = './/span[@class="st"]' diff --git a/searx/tests/engines/test_google.py b/searx/tests/engines/test_google.py @@ -40,7 +40,7 @@ class TestGoogleEngine(SearxTestCase): self.assertEqual(google.response(response), []) html = """ - <li class="g"> + <div class="g"> <h3 class="r"> <a href="http://this.should.be.the.link/"> <b>This</b> is <b>the</b> title @@ -94,35 +94,35 @@ class TestGoogleEngine(SearxTestCase): </a> </div> </div> - </li> - <li class="g"> + </div> + <div class="g"> <h3 class="r"> <a href="http://www.google.com/images?q=toto"> <b>This</b> </a> </h3> - </li> - <li class="g"> + </div> + <div class="g"> <h3 class="r"> <a href="http://www.google.com/search?q=toto"> <b>This</b> is </a> </h3> - </li> - <li class="g"> + </div> + <div class="g"> <h3 class="r"> <a href="€"> <b>This</b> is <b>the</b> </a> </h3> - </li> - <li class="g"> + </div> + <div class="g"> <h3 class="r"> <a href="/url?q=url"> <b>This</b> is <b>the</b> </a> </h3> - </li> + </div> <p class="_Bmc" style="margin:3px 8px"> <a href="/search?num=20&amp;safe=off&amp;q=t&amp;revid=1754833769&amp;sa=X&amp;ei=-&amp;ved="> suggestion <b>title</b>