Corpus analysis version 3.0 lul

app/corpora/pj_events.py

@@ -67,7 +67,7 @@ def pj_corpus_analysis_query(query):
         socketio.emit('pj_corpus_analysis_query', response, room=request.sid)
         return
     response = {'code': 200, 'desc': None, 'msg': 'OK',
-                'payload': {**query_status, 'num_matches': results.size}}
+                'payload': {**query_status, 'match_count': results.size}}
     socketio.emit('pj_corpus_analysis_query', response, room=request.sid)
     chunk_size = 100
     chunk_start = 0

app/corpora/pj_forms.py

@@ -1,9 +1,11 @@
 from flask_wtf import FlaskForm
 from wtforms import BooleanField, StringField, SubmitField, SelectField
+from wtforms.validators import DataRequired, Length
 
 
 class PJQueryForm(FlaskForm):
-    query = StringField('Query')
+    query = StringField('Query',
+                        validators=[DataRequired(), Length(1, 1024)])
     submit = SubmitField('Send query')
 
 
@@ -33,3 +35,13 @@ class PJDisplayOptionsForm(FlaskForm):
                                             ('80', '80'),
                                             ('90', '90'),
                                             ('100', '100')])
+
+
+class QueryDownloadForm(FlaskForm):
+    file_type = SelectField('File type',
+                            choices=[('', 'Choose file type'),
+                                     ('csv', 'csv'),
+                                     ('json', 'json'),
+                                     ('excel', 'excel'),
+                                     ('html', 'html-table')],
+                            validators=[DataRequired()])

app/corpora/pj_views.py

@@ -1,7 +1,7 @@
 from flask import request, render_template
 from flask_login import login_required
 from . import corpora
-from .pj_forms import PJDisplayOptionsForm, PJQueryForm
+from .pj_forms import PJDisplayOptionsForm, PJQueryForm, QueryDownloadForm
 from .. import db
 from ..models import Corpus
 
@@ -19,7 +19,10 @@ def pj_analyse_corpus(corpus_id):
         results_per_page=request.args.get('results_per_page', 30))
     query_form = PJQueryForm(prefix='query-form',
                              query=request.args.get('query'))
+    query_download_form = QueryDownloadForm()
     return render_template('corpora/pj_analyse_corpus.html.j2',
                            corpus_id=corpus_id,
                            display_options_form=display_options_form,
-                           query_form=query_form, title='Corpus analysis')
+                           query_form=query_form,
+                           query_download_form=query_download_form,
+                           title='Corpus analysis')