git.iko.soy/searx
on master help sign in
[fix] google markup change - closes #489
commit66f48c2bf5b84f6f7b52b1ba7217a1aadf5717b7 authorAdam Tauber <asciimoo@gmail.com> dateSun 10 Jan 2016, 18:49 (11 years ago) parent44c7eac
2 files changed+12−12
compare with master
unifiedsplit
searx/engines/google.py+2−2 searx/tests/engines/test_google.py+10−10
searx/engines/google.py+2−2
@@ -90,7 +90,7 @@ url_map = 'https://www.openstreetmap.org/'\
9090search_path = '/search'
9191search_url = ('https://{hostname}' +
9292 search_path +
93− '?{query}&start={offset}&gbv=1&gws_rd=cr')
93+ '?{query}&start={offset}&gbv=1&gws_rd=ssl')
9494
9595# other URLs
9696map_hostname_start = 'maps.google.'
@@ -99,7 +99,7 @@ redirect_path = '/url'
9999images_path = '/images'
100100
101101# specific xpath variables
102−results_xpath = '//li[@class="g"]'
102+results_xpath = '//div[@class="g"]'
103103url_xpath = './/h3/a/@href'
104104title_xpath = './/h3'
105105content_xpath = './/span[@class="st"]'
searx/tests/engines/test_google.py+10−10
@@ -40,7 +40,7 @@ class TestGoogleEngine(SearxTestCase):
4040 self.assertEqual(google.response(response), [])
4141
4242 html = """
43− <li class="g">
43+ <div class="g">
4444 <h3 class="r">
4545 <a href="http://this.should.be.the.link/">
4646 <b>This</b> is <b>the</b> title
@@ -94,35 +94,35 @@ class TestGoogleEngine(SearxTestCase):
9494 </a>
9595 </div>
9696 </div>
97− </li>
98− <li class="g">
97+ </div>
98+ <div class="g">
9999 <h3 class="r">
100100 <a href="http://www.google.com/images?q=toto">
101101 <b>This</b>
102102 </a>
103103 </h3>
104− </li>
105− <li class="g">
104+ </div>
105+ <div class="g">
106106 <h3 class="r">
107107 <a href="http://www.google.com/search?q=toto">
108108 <b>This</b> is
109109 </a>
110110 </h3>
111− </li>
112− <li class="g">
111+ </div>
112+ <div class="g">
113113 <h3 class="r">
114114 <a href="€">
115115 <b>This</b> is <b>the</b>
116116 </a>
117117 </h3>
118− </li>
119− <li class="g">
118+ </div>
119+ <div class="g">
120120 <h3 class="r">
121121 <a href="/url?q=url">
122122 <b>This</b> is <b>the</b>
123123 </a>
124124 </h3>
125− </li>
125+ </div>
126126 <p class="_Bmc" style="margin:3px 8px">
127127 <a href="/search?num=20&amp;safe=off&amp;q=t&amp;revid=1754833769&amp;sa=X&amp;ei=-&amp;ved=">
128128 suggestion <b>title</b>