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

Simplify db lookup for queries by id

Browse Source
This commit is contained in:
Patrick Jentsch
2019-11-15 13:09:12 +01:00
parent 7457a4be94
commit 5fd9711da9
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/corpora/background_functions.py
View File

@ -3,7 +3,7 @@ from app.models import Corpus, CorpusFile
def delete_corpus_(app, corpus_id):
with app.app_context():
corpus = Corpus.query.filter_by(id=corpus_id).first()
corpus = Corpus.query.get(corpus_id)
if corpus is None:
raise Exception('Corpus {} not found!'.format(corpus_id))
corpus.delete()
@ -11,7 +11,7 @@ def delete_corpus_(app, corpus_id):
def delete_corpus_file_(app, corpus_file_id):
with app.app_context():
corpus_file = CorpusFile.query.filter_by(id=corpus_file_id).first()
corpus_file = CorpusFile.query.get(corpus_file_id)
if corpus_file is None:
raise Exception('Corpus file {} not found!'.format(corpus_file_id))
corpus_file.delete()
@ -19,7 +19,7 @@ def delete_corpus_file_(app, corpus_file_id):
def edit_corpus_file_(app, corpus_file_id):
with app.app_context():
corpus_file = CorpusFile.query.filter_by(id=corpus_file_id).first()
corpus_file = CorpusFile.query.get(corpus_file_id)
if corpus_file is None:
raise Exception('Corpus file {} not found!'.format(corpus_file_id))
corpus_file.insert_metadata()

7
app/corpora/events.py
View File

@ -22,7 +22,7 @@ analysis_clients = {}
@socketio.on('init_corpus_analysis')
@login_required
def init_corpus_analysis(corpus_id):
corpus = Corpus.query.filter_by(id=corpus_id).first()
corpus = Corpus.query.get(corpus_id)
if corpus is None:
socketio.emit('init_corpus_analysis', '[ERROR 404]: Not Found',
room=request.sid)
@ -85,7 +85,10 @@ def recv_query(message):
def observe_corpus_analysis_connection(app, corpus_id, session_id):
with app.app_context():
corpus = Corpus.query.filter_by(id=corpus_id).first()
corpus = Corpus.query.get(corpus_id)
if corpus is None:
''' TODO: Handle this '''
return
while corpus.status != 'analysing':
db.session.refresh(corpus)
socketio.sleep(3)