equal
deleted
inserted
replaced
404 disciplines = [{'label':tag.label,'score':tag.nb, 'translated_label': translations.get(tag.dbpedia_fields.id, tag.label) if tag.dbpedia_fields is not None else tag.label} for tag in discqslist] |
404 disciplines = [{'label':tag.label,'score':tag.nb, 'translated_label': translations.get(tag.dbpedia_fields.id, tag.label) if tag.dbpedia_fields is not None else tag.label} for tag in discqslist] |
405 |
405 |
406 years = {} |
406 years = {} |
407 yearqs = yearqs.annotate(nb=Count('tag__taggedsheet')) |
407 yearqs = yearqs.annotate(nb=Count('tag__taggedsheet')) |
408 for ty in yearqs: |
408 for ty in yearqs: |
409 if ty.start_year==ty.end_year: |
409 for year in range(ty.start_year, ty.end_year): |
410 years[ty.start_year] = ty.nb |
410 years[year] = ty.nb + (years[year] if year in years else 0) |
411 else: |
|
412 for year in range(ty.start_year, ty.end_year): |
|
413 years[year] = ty.nb + (years[year] if year in years else 0) |
|
414 |
411 |
415 yearchange = [] |
412 yearchange = [] |
416 for year in sorted(years.keys()): |
413 for year in sorted(years.keys()): |
417 score = years[year] |
414 score = years[year] |
418 if year < 2011: |
415 if year < 2011: |