diff -r d58ab6429d5a -r fc8961398609 src/hdalab/views/ajax.py --- a/src/hdalab/views/ajax.py Tue Sep 02 15:13:42 2014 +0200 +++ b/src/hdalab/views/ajax.py Tue Sep 02 17:55:25 2014 +0200 @@ -374,7 +374,12 @@ for ts in qs: if hasattr(ts, 'tag') and hasattr(ts.tag, 'dbpedia_fields') : match_tag = ts.tag.id in matchtagids - contenus[ts.datasheet_id]['tags'].append({'id': ts.tag.id, 'label':ts.tag.label, '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}) + contenus[ts.datasheet_id]['tags'].append({'id': ts.tag.id, + 'label': ts.tag.label, + '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}) if match_tag: contenus[ts.datasheet_id]['score'] += 2*max_tag_order - ts.order @@ -401,7 +406,12 @@ transqs = DbpediaFieldsTranslation.objects.filter(master__in = dbpediafields.values(), language_code = lang) translations = dict([(trans.master_id,trans.label) for trans in transqs]) - tags = [{'id': tag.id, 'label': tag.label, 'score': tag.nb, 'thumbnail': dbpediafields[tag.id].thumbnail, 'translated_label': translations.get(dbpediafields[tag.id].id, tag.label) if tag.id in dbpediafields else tag.label} for tag in tagqslist] + tags = [{'id': tag.id, + 'label': tag.label, + 'score': tag.nb, + 'thumbnail': dbpediafields[tag.id].thumbnail, + '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] countryqs = countryqs.annotate(nb=Count('includes__tag__taggedsheet')) countries = dict([(country.dbpedia_uri, country.nb) for country in countryqs])