@@ -124,9 +124,6 @@ image_img_src_xpath = './img/@src'
124124# FIXME : no translation
125125property_address = "Address"
126126property_phone = "Phone number"
127−property_location = "Location"
128−property_website = "Web site"
129−property_gplus_website = "Google plus"
130127
131128# cookies
132129pref_cookie = ''
@@ -166,19 +163,6 @@ def parse_url(url_string, google_hostname):
166163 return url_string
167164
168165
169−# URL : get label
170−def url_get_label(url_string):
171− # sanity check
172− if url_string is None:
173− return url_string
174−
175− # normal case
176− parsed_url = urlparse(url_string)
177− if parsed_url.netloc == 'plus.google.com':
178− return property_gplus_website
179− return property_website
180−
181−
182166# returns extract_text on the first result selected by the xpath or None
183167def extract_text_from_dom(result, xpath):
184168 r = result.xpath(xpath)
@@ -281,9 +265,9 @@ def response(resp):
281265 # append result
282266 results.append({'url': url,
283267 'title': title,
284− 'content': content})
285− except Exception, e:
286− print e
268+ 'content': content
269+ })
270+ except:
287271 continue
288272
289273 # parse suggestion