equal
deleted
inserted
replaced
405 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 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] |
406 |
406 |
407 years = {} |
407 years = {} |
408 yearqs = yearqs.annotate(nb=Count('tag__taggedsheet')) |
408 yearqs = yearqs.annotate(nb=Count('tag__taggedsheet')) |
409 for ty in yearqs: |
409 for ty in yearqs: |
410 for year in range(ty.start_year, ty.end_year): |
410 if ty.start_year==ty.end_year: |
411 years[year] = ty.nb + (years[year] if year in years else 0) |
411 years[ty.start_year] = ty.nb |
|
412 else: |
|
413 for year in range(ty.start_year, ty.end_year): |
|
414 years[year] = ty.nb + (years[year] if year in years else 0) |
412 |
415 |
413 yearchange = [] |
416 yearchange = [] |
414 for year in sorted(years.keys()): |
417 for year in sorted(years.keys()): |
415 score = years[year] |
418 score = years[year] |
416 if year < 2011: |
419 if year < 2011: |