--- a/src/hdalab/views/ajax.py Wed Feb 18 16:22:38 2015 +0100
+++ b/src/hdalab/views/ajax.py Thu Feb 19 02:43:46 2015 +0100
@@ -222,7 +222,7 @@
for t in qslist:
if hasattr(t, 'dbpedia_fields'):
dbfields = t.dbpedia_fields
- resobj = {'original_label':t.label, 'url':t.dbpedia_uri}
+ resobj = {'original_label':t.label, 'url':t.wikipedia_url}
if count_notices_bool:
resobj['nb'] = t.nb
resobj['thumbnail'] = dbfields.thumbnail if dbfields is not None else None
@@ -381,7 +381,8 @@
'order': ts.order,
'match': match_tag,
'translated_label': translations.get(ts.tag.dbpedia_fields.id, ts.tag.label) if ts.tag.dbpedia_fields is not None else ts.tag.label,
- 'url': ts.tag.dbpedia_uri})
+ 'url': ts.tag.dbpedia_uri,
+ 'wkpd_url': ts.tag.wikipedia_url})
if match_tag:
contenus[ts.datasheet_id]['score'] += 2*max_tag_order - ts.order
@@ -413,7 +414,8 @@
'score': tag.nb,
'thumbnail': dbpediafields[tag.id].thumbnail if tag.id in dbpediafields else None,
'translated_label': translations.get(dbpediafields[tag.id].id, tag.label) if tag.id in dbpediafields else tag.label,
- 'url': tag.dbpedia_uri} for tag in tagqslist]
+ 'url': tag.dbpedia_uri,
+ 'wkpd_url': tag.wikipedia_url} for tag in tagqslist]
countryqs = countryqs.annotate(nb=Count('includes__tag__taggedsheet'))
countries = dict([(country.dbpedia_uri, country.nb) for country in countryqs])