Commit 14562feb authored by Administrator's avatar Administrator

Merge branch 'samuel' into unstable

parents d40ede9a 11923411
...@@ -59,19 +59,21 @@ def project(request, project_id): ...@@ -59,19 +59,21 @@ def project(request, project_id):
corpora_by_resourcetype = defaultdict(list) corpora_by_resourcetype = defaultdict(list)
documents_count_by_resourcetype = defaultdict(int) documents_count_by_resourcetype = defaultdict(int)
corpora_count = 0 corpora_count = 0
corpusID_dict = {}
for corpus_id, corpus_name, resource_type_id, document_count in corpus_query: for corpus_id, corpus_name, resource_type_id, document_count in corpus_query:
if resource_type_id is None: if not corpus.id in corpusID_dict:
resourcetype_name = '(no resource)' if resource_type_id is None:
else: resourcetype_name = '(no resource)'
resourcetype = cache.ResourceType[resource_type_id] else:
resourcetype_name = resourcetype.name resourcetype = cache.ResourceType[resource_type_id]
corpora_by_resourcetype[resourcetype_name].append({ resourcetype_name = resourcetype.name
'id': corpus_id, corpora_by_resourcetype[resourcetype_name].append({
'name': corpus_name, 'id': corpus_id,
'count': document_count, 'name': corpus_name,
}) 'count': document_count,
documents_count_by_resourcetype[resourcetype_name] += document_count })
corpora_count += 1 documents_count_by_resourcetype[resourcetype_name] += document_count
corpora_count += 1
# do the donut # do the donut
total_documents_count = sum(documents_count_by_resourcetype.values()) total_documents_count = sum(documents_count_by_resourcetype.values())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment