@@ -33,17 +33,20 @@ def response(resp):
3333 return results
3434
3535def getDetail(jsonresponse, wikidata_id, language):
36+ results = []
37+ urls = []
38+ attributes = []
39+
3640 result = jsonresponse.get('entities', {}).get(wikidata_id, {})
3741
3842 title = result.get('labels', {}).get(language, {}).get('value', None)
3943 if title == None:
40− title = result.get('labels', {}).get('en', {}).get('value', wikidata_id)
41− results = []
42− urls = []
43− attributes = []
44+ title = result.get('labels', {}).get('en', {}).get('value', None)
45+ if title == None:
46+ return results
4447
45− description = result.get('descriptions', {}).get(language, {}).get('value', '')
46− if description == '':
48+ description = result.get('descriptions', {}).get(language, {}).get('value', None)
49+ if description == None:
4750 description = result.get('descriptions', {}).get('en', {}).get('value', '')
4851
4952 claims = result.get('claims', {})
@@ -52,11 +55,16 @@ def getDetail(jsonresponse, wikidata_id, language):
5255 urls.append({ 'title' : 'Official site', 'url': official_website })
5356 results.append({ 'title': title, 'url' : official_website })
5457
58+ wikipedia_link_count = 0
5559 if language != 'en':
56− add_url(urls, 'Wikipedia (' + language + ')', get_wikilink(result, language + 'wiki'))
60+ wikipedia_link_count += add_url(urls, 'Wikipedia (' + language + ')', get_wikilink(result, language + 'wiki'))
5761 wikipedia_en_link = get_wikilink(result, 'enwiki')
58− add_url(urls, 'Wikipedia (en)', wikipedia_en_link)
59−
62+ wikipedia_link_count += add_url(urls, 'Wikipedia (en)', wikipedia_en_link)
63+ if wikipedia_link_count == 0:
64+ misc_language = get_wiki_firstlanguage(result, 'wiki')
65+ if misc_language != None:
66+ add_url(urls, 'Wikipedia (' + misc_language + ')', get_wikilink(result, misc_language + 'wiki'))
67+
6068 if language != 'en':
6169 add_url(urls, 'Wiki voyage (' + language + ')', get_wikilink(result, language + 'wikivoyage'))
6270 add_url(urls, 'Wiki voyage (en)', get_wikilink(result, 'enwikivoyage'))
@@ -105,14 +113,20 @@ def getDetail(jsonresponse, wikidata_id, language):
105113 if date_of_death != None:
106114 attributes.append({'label' : 'Date of death', 'value' : date_of_death})
107115
108−
109− results.append({
110− 'infobox' : title,
111− 'id' : wikipedia_en_link,
112− 'content' : description,
113− 'attributes' : attributes,
114− 'urls' : urls
115− })
116+ if len(attributes)==0 and len(urls)==2 and len(description)==0:
117+ results.append({
118+ 'url': urls[0]['url'],
119+ 'title': title,
120+ 'content': description
121+ })
122+ else:
123+ results.append({
124+ 'infobox' : title,
125+ 'id' : wikipedia_en_link,
126+ 'content' : description,
127+ 'attributes' : attributes,
128+ 'urls' : urls
129+ })
116130
117131 return results
118132
@@ -120,7 +134,9 @@ def getDetail(jsonresponse, wikidata_id, language):
120134def add_url(urls, title, url):
121135 if url != None:
122136 urls.append({'title' : title, 'url' : url})
123−
137+ return 1
138+ else:
139+ return 0
124140
125141def get_mainsnak(claims, propertyName):
126142 propValue = claims.get(propertyName, {})
@@ -213,3 +229,9 @@ def get_wikilink(result, wikiid):
213229 elif url.startswith('//'):
214230 url = 'https:' + url
215231 return url
232+
233+def get_wiki_firstlanguage(result, wikipatternid):
234+ for k in result.get('sitelinks', {}).keys():
235+ if k.endswith(wikipatternid) and len(k)==(2+len(wikipatternid)):
236+ return k[0:2]
237+ return None