OwlBurst/Ponysearch
1
0
Fork 0
forked from Ponysearch/Ponysearch
Code Pull requests Activity

[fix] google markup change - closes #489

Browse source
This commit is contained in:
Adam Tauber 2016-01-10 18:49:50 +01:00
parent 44c7eac958
commit 66f48c2bf5
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
searx/engines/google.py
View file

@ -90,7 +90,7 @@ url_map = 'https://www.openstreetmap.org/'\
search_path = '/search' search_path = '/search'
search_url = ('https://{hostname}' + search_url = ('https://{hostname}' +
search_path + search_path +
'?{query}&start={offset}&gbv=1&gws_rd=cr') '?{query}&start={offset}&gbv=1&gws_rd=ssl')
# other URLs # other URLs
map_hostname_start = 'maps.google.' map_hostname_start = 'maps.google.'
@ -99,7 +99,7 @@ redirect_path = '/url'
images_path = '/images' images_path = '/images'
# specific xpath variables # specific xpath variables
results_xpath = '//li[@class="g"]' results_xpath = '//div[@class="g"]'
url_xpath = './/h3/a/@href' url_xpath = './/h3/a/@href'
title_xpath = './/h3' title_xpath = './/h3'
content_xpath = './/span[@class="st"]' content_xpath = './/span[@class="st"]'

20
searx/tests/engines/test_google.py
View file

@ -40,7 +40,7 @@ class TestGoogleEngine(SearxTestCase):
self.assertEqual(google.response(response), []) self.assertEqual(google.response(response), [])
html = """ html = """
<li class="g"> <div class="g">
<h3 class="r"> <h3 class="r">
<a href="http://this.should.be.the.link/"> <a href="http://this.should.be.the.link/">
<b>This</b> is <b>the</b> title <b>This</b> is <b>the</b> title
@ -94,35 +94,35 @@ class TestGoogleEngine(SearxTestCase):
</a> </a>
</div> </div>
</div> </div>
</li> </div>
<li class="g"> <div class="g">
<h3 class="r"> <h3 class="r">
<a href="http://www.google.com/images?q=toto"> <a href="http://www.google.com/images?q=toto">
<b>This</b> <b>This</b>
</a> </a>
</h3> </h3>
</li> </div>
<li class="g"> <div class="g">
<h3 class="r"> <h3 class="r">
<a href="http://www.google.com/search?q=toto"> <a href="http://www.google.com/search?q=toto">
<b>This</b> is <b>This</b> is
</a> </a>
</h3> </h3>
</li> </div>
<li class="g"> <div class="g">
<h3 class="r"> <h3 class="r">
<a href="€"> <a href="€">
<b>This</b> is <b>the</b> <b>This</b> is <b>the</b>
</a> </a>
</h3> </h3>
</li> </div>
<li class="g"> <div class="g">
<h3 class="r"> <h3 class="r">
<a href="/url?q=url"> <a href="/url?q=url">
<b>This</b> is <b>the</b> <b>This</b> is <b>the</b>
</a> </a>
</h3> </h3>
</li> </div>
<p class="_Bmc" style="margin:3px 8px"> <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="> <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> suggestion <b>title</b>