From 9da08508c0a7195aab6ebcaff4e5d0dfdbefc61e Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <pjentsch@sfb1288inf-Laptop.fritz.box>
Date: Fri, 3 Apr 2020 17:36:38 +0200
Subject: [PATCH] Add changes for new OCR and NLP Pipelines
---
app/jobs/forms.py | 14 +++++---------
app/services/views.py | 4 ++--
app/templates/services/ocr.html.j2 | 2 +-
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/app/jobs/forms.py b/app/jobs/forms.py
index d47e9403..2b569a7f 100644
--- a/app/jobs/forms.py
+++ b/app/jobs/forms.py
@@ -21,9 +21,7 @@ class AddNLPJobForm(FlaskForm):
validators=[DataRequired()])
submit = SubmitField()
title = StringField('Title', validators=[DataRequired(), Length(1, 32)])
- version = SelectField('Version',
- choices=[('2.2.0', 'Latest (2.2.0)'),
- ('2.2.0', '2.2.0')],
+ version = SelectField('Version', choices=[('latest', 'Latest')],
validators=[DataRequired()])
check_encoding = BooleanField('Check encoding')
@@ -54,15 +52,14 @@ class AddOCRJobForm(FlaskForm):
split = BooleanField('Split')
submit = SubmitField()
title = StringField('Title', validators=[DataRequired(), Length(1, 32)])
- version = SelectField('Version',
- choices=[('latest', 'Latest')],
+ version = SelectField('Version', choices=[('latest', 'Latest')],
validators=[DataRequired()])
def validate_files(form, field):
for file in field.data:
- if not file.filename.lower().endswith(('.pdf', '.tif', '.tiff')):
+ if not file.filename.lower().endswith('.pdf'):
raise ValidationError('File does not have an approved '
- 'extension: .pdf | .tif | .tiff')
+ 'extension: .pdf')
class AddSetupFilesJobForm(FlaskForm):
@@ -71,8 +68,7 @@ class AddSetupFilesJobForm(FlaskForm):
submit = SubmitField()
title = StringField('Title', validators=[DataRequired(), Length(1, 32)])
files = MultipleFileField('Files', validators=[DataRequired()])
- version = SelectField('Version',
- choices=[('latest', 'Latest')],
+ version = SelectField('Version', choices=[('latest', 'Latest')],
validators=[DataRequired()])
def validate_files(form, field):
diff --git a/app/services/views.py b/app/services/views.py
index 2339260b..c906acef 100644
--- a/app/services/views.py
+++ b/app/services/views.py
@@ -41,8 +41,8 @@ def service(service):
service_args.append('--check-encoding')
if service == 'ocr':
service_args.append('-l {}'.format(add_job_form.language.data))
- if not add_job_form.binarization.data:
- service_args.append('--skip-binarisation')
+ if add_job_form.binarization.data:
+ service_args.append('--binarize')
job = Job(creator=current_user,
description=add_job_form.description.data,
mem_mb=SERVICES[service]['resources']['mem_mb'],
diff --git a/app/templates/services/ocr.html.j2 b/app/templates/services/ocr.html.j2
index 76cfac6b..6986f7f7 100644
--- a/app/templates/services/ocr.html.j2
+++ b/app/templates/services/ocr.html.j2
@@ -53,7 +53,7 @@
<div class="file-field input-field">
<div class="btn">
<span>{{ add_job_form.files.label.text }}</span>
- {{ add_job_form.files(accept='application/pdf, image/tiff') }}
+ {{ add_job_form.files(accept='application/pdf') }}
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
--
GitLab