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

Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

Browse Source
This commit is contained in:
Patrick Jentsch
2019-10-30 08:28:54 +01:00
parent 7fb37dcb70 f586518e9a
commit 8b8939b17a
3 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/main/forms.py
View File

@ -1,6 +1,6 @@
from flask_wtf import FlaskForm
from wtforms import (FileField, IntegerField, StringField, SubmitField,
ValidationError)
from wtforms import (FileField, StringField, SubmitField,
ValidationError, IntegerField, SelectField)
from wtforms.validators import DataRequired, Length
@ -26,8 +26,27 @@ class CreateCorpusForm(FlaskForm):
class QueryForm(FlaskForm):
query = StringField('CQP Query', validators=[DataRequired()])
# hits_per_page = IntegerField('Hits per page',
# validators=[DataRequired(),
# NumberRange(min=10, max=50)])
query = StringField('CQP Query', validators=[DataRequired(), (Length(1, 1024))])
hits_per_page = SelectField('Hits per page',
choices=[('', 'Nr. of hits per page'),
('10', '10'),
('20', '20'),
('30', '30'),
('40', '40'),
('50', '50')],
validators=[DataRequired()],
default='30')
context = SelectField('Context',
choices=[('', 'Words of context around hit'),
('5', '5'),
('10', '10'),
('15', '15'),
('20', '20'),
('25', '25')],
validators=[DataRequired()],
default='10')
submit = SubmitField('Start Query')
class QueryDownloadForm(FlaskForm):
pass

11
app/main/views.py
View File

@ -90,15 +90,24 @@ def corpus_download(corpus_id):
@login_required
def corpus_analysis(corpus_id):
corpus = Corpus.query.get_or_404(corpus_id)
query = request.args.get('query')
form = QueryForm()
if form.validate_on_submit():
logger = logging.getLogger(__name__)
logger.warning('Data has been sent!')
logger.warning('Data labels: {data}'.format(data=[data for data in form.data]))
logger.warning('Query: {q}'.format(q=form.query.data))
logger.warning('Hits: {hits}'.format(hits=form.hits_per_page.data))
logger.warning('Context: {context}'.format(context=form.context.data))
flash('Query has been sent!')
return redirect(url_for('main.corpus_analysis', corpus_id=corpus_id))
query = form.query.data
logger.warning('Session query: {sq}'.format(sq=query))
return redirect(url_for('main.corpus_analysis', corpus_id=corpus_id,
query=query))
return render_template('main/corpora/corpus_analysis.html.j2',
corpus=corpus,
form=form,
query=query,
title='Corpus: ' + corpus.title)