sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-11-04 04:12:45 +00:00
Code Issues Projects Releases Wiki Activity

Fully integrate new query_results model. old one is now deprecated.

Browse Source
This commit is contained in:
Patrick Jentsch
2020-07-15 13:16:31 +02:00
parent ba49bb39e9
commit 0714070a9b
3 changed files with 87 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/app/query_results/views.py
View File

@@ -1,7 +1,7 @@
from . import query_results
from . import tasks
from .. import db
from ..corpora.forms import DisplayOptionsForm
from ..corpora.forms import DisplayOptionsForm, InspectDisplayOptionsForm
from ..models import QueryResult
from .forms import AddQueryResultForm
from flask import (abort, current_app, flash, make_response, redirect,
@@ -101,6 +101,9 @@ def inspect_query_result(query_result_id):
results_per_page=request.args.get('results_per_page', 30),
result_context=request.args.get('context', 20)
)
inspect_display_options_form = InspectDisplayOptionsForm(
prefix='inspect-display-options-form'
)
query_result_file_path = os.path.join(
current_app.config['NOPAQUE_STORAGE'],
str(current_user.id),
@@ -109,10 +112,11 @@ def inspect_query_result(query_result_id):
query_result.filename
)
with open(query_result_file_path, 'r') as query_result_file:
query_result_content = json.load(query_result_file)
return render_template('query_results/inspect_query_result.html.j2',
query_result_file_content = json.load(query_result_file)
return render_template('query_results/inspect.html.j2',
display_options_form=display_options_form,
query_result_content=query_result_content,
inspect_display_options_form=inspect_display_options_form,
query_result_file_content=query_result_file_content,
title='Inspect query result')