Commit 4c394a92 authored by Administrator's avatar Administrator

cosmetics

parent 930c08e8
...@@ -72,7 +72,7 @@ def home(request): ...@@ -72,7 +72,7 @@ def home(request):
def projects(request): def projects(request):
if not request.user.is_authenticated(): if not request.user.is_authenticated():
return redirect('/login/?next=%s' % request.path) return redirect('/admin/logout/?next=%s' % request.path)
t = get_template('projects.html') t = get_template('projects.html')
...@@ -150,6 +150,7 @@ def corpus(request, project_id, corpus_id): ...@@ -150,6 +150,7 @@ def corpus(request, project_id, corpus_id):
documents = corpus.children documents = corpus.children
number = corpus.children.count() number = corpus.children.count()
try:
sources = query_to_dicts('''select count(*), source sources = query_to_dicts('''select count(*), source
from node_node as t1 from node_node as t1
INNER JOIN documents_document_corpus as t2 INNER JOIN documents_document_corpus as t2
...@@ -157,6 +158,8 @@ def corpus(request, project_id, corpus_id): ...@@ -157,6 +158,8 @@ def corpus(request, project_id, corpus_id):
WHERE ( t1.user_id = %d AND t2.corpus_id = %d ) WHERE ( t1.user_id = %d AND t2.corpus_id = %d )
GROUP BY source GROUP BY source
order by 1 DESC limit %d;''' % (request.user.pk, int(corpus_id), int(15))) order by 1 DESC limit %d;''' % (request.user.pk, int(corpus_id), int(15)))
except:
pass
sources_donut = [] sources_donut = []
for s in sources: for s in sources:
...@@ -186,6 +189,7 @@ def corpus(request, project_id, corpus_id): ...@@ -186,6 +189,7 @@ def corpus(request, project_id, corpus_id):
date_format = 'YYYY-MM-DD' date_format = 'YYYY-MM-DD'
date_form = 'days' date_form = 'days'
try:
dates = query_to_dicts('''select to_char(t1.date, '%s'), count(*) dates = query_to_dicts('''select to_char(t1.date, '%s'), count(*)
from documents_document as t1 from documents_document as t1
INNER JOIN documents_document_corpus as t2 INNER JOIN documents_document_corpus as t2
...@@ -193,6 +197,8 @@ def corpus(request, project_id, corpus_id): ...@@ -193,6 +197,8 @@ def corpus(request, project_id, corpus_id):
WHERE ( t1.user_id = %d AND t2.corpus_id = %d ) WHERE ( t1.user_id = %d AND t2.corpus_id = %d )
group by to_char(t1.date, '%s') group by to_char(t1.date, '%s')
order by 1 DESC;''' % (date_format, request.user.pk, int(corpus_id), date_format)) order by 1 DESC;''' % (date_format, request.user.pk, int(corpus_id), date_format))
except:
pass
histo = [] histo = []
......
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