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

Cleanup corpus analysis code

Browse Source
This commit is contained in:
Patrick Jentsch
2019-11-14 15:53:43 +01:00
parent df98f3a900
commit 3fb5802682
3 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/corpora/views.py
View File

@ -1,4 +1,4 @@
from app import db, logger
from app import db
from app.models import Corpus, CorpusFile
from flask import (abort, current_app, flash, redirect, request,
render_template, url_for, send_from_directory)
@ -6,7 +6,7 @@ from flask_login import current_user, login_required
from werkzeug.utils import secure_filename
from . import corpora
from .background_functions import (delete_corpus_, delete_corpus_file_,
edit_corpus_file_)
edit_corpus_file_)
from .forms import (AddCorpusFileForm, AddCorpusForm, EditCorpusFileForm,
QueryDownloadForm, QueryForm)
import os
@ -48,31 +48,21 @@ def corpus(corpus_id):
title='Corpus')
@corpora.route('/<int:corpus_id>/analysis', methods=['GET', 'POST'])
@corpora.route('/<int:corpus_id>/analyse')
@login_required
def corpus_analysis(corpus_id):
def analyse_corpus(corpus_id):
corpus = Corpus.query.get_or_404(corpus_id)
if corpus.status == 'prepared':
corpus.status = 'start analysis'
db.session.commit()
query = request.args.get('query')
logger.warning('Query first: {}'.format(query))
hits_per_page = request.args.get('hits_per_page', 30)
context = request.args.get('context', 10)
dl_form = QueryDownloadForm()
form = QueryForm(hits_per_page=hits_per_page, context=context, query=query)
if form.validate_on_submit():
flash('Query has been sent!')
query = form.query.data
hits_per_page = form.hits_per_page.data
context = form.context.data
return redirect(url_for('corpora.corpus_analysis', corpus_id=corpus_id,
query=query, hits_per_page=hits_per_page,
context=context))
return render_template('corpora/corpus_analysis.html.j2',
query_download_form = QueryDownloadForm()
query_form = QueryForm(context=request.args.get('context', 10),
hits_per_page=request.args.get('hits_per_page', 30),
query=request.args.get('query'))
return render_template('corpora/analyse_corpus.html.j2',
corpus_id=corpus_id,
form=form, dl_form=dl_form,
title='Corpus: {}'.format(corpus.title))
query_download_form=query_download_form,
query_form=query_form, title='Analyse Corpus')
@corpora.route('/<int:corpus_id>/delete')