Commit 856ffe4b authored by PkSM3's avatar PkSM3

[BUGFIX] again: corpora list -> GROUP BY ID!

parent 8965527b
...@@ -93,7 +93,7 @@ WSGI_APPLICATION = 'wsgi.application' ...@@ -93,7 +93,7 @@ WSGI_APPLICATION = 'wsgi.application'
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2', 'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'gargandb', 'NAME': 'clone_gargandb',
'USER': 'alexandre', 'USER': 'alexandre',
'PASSWORD': 'C8kdcUrAQy66U', 'PASSWORD': 'C8kdcUrAQy66U',
#'USER': 'gargantext', #'USER': 'gargantext',
......
...@@ -57,19 +57,23 @@ def project(request, project_id): ...@@ -57,19 +57,23 @@ 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, resource, document_count in corpus_query: for corpus, resource, document_count in corpus_query:
if resource is None: if not corpus.id in corpusID_dict:
resourcetype_name = '(no resource)' if resource 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, corpusID_dict[corpus.id] = True
'name': corpus.name, corpora_by_resourcetype[resourcetype_name].append({
'count': document_count, 'id': corpus.id,
}) 'name': corpus.name,
documents_count_by_resourcetype[resourcetype_name] += document_count 'count': 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