sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-11-03 20:02:47 +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:
Stephan Porada
2020-04-15 14:55:36 +02:00
parent 9031ca5845 b1d819444e
commit 68eb1d1972
8 changed files with 72 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/corpora/cqi/models/corpora.py
View File

@@ -61,6 +61,9 @@ class Corpus(Model):
subattr_value
return lookups
def drop(self):
return self.client.api.corpus_drop_corpus(self.attrs['api_name'])
def query(self, query, subcorpus_name='Results'):
return self.client.api.cqp_query(self.attrs['api_name'],
subcorpus_name, query)

11
app/corpora/views.py
View File

@@ -1,4 +1,4 @@
from flask import (abort, current_app, flash, redirect, request,
from flask import (abort, current_app, flash, make_response, redirect, request,
render_template, url_for, send_from_directory)
from flask_login import current_user, login_required
from threading import Thread
@@ -99,8 +99,8 @@ def add_corpus_file(corpus_id):
for corpus_file in corpus.files:
if filename == corpus_file.filename:
flash('File already registered to this corpus.')
return redirect(url_for('corpora.add_corpus_file',
corpus_id=corpus_id))
return make_response({'redirect_url': url_for('corpora.corpus', corpus_id=corpus.id)}, 500)
# return redirect(url_for('corpora.add_corpus_file', corpus_id=corpus_id))
# Save the file
dir = os.path.join(str(corpus.user_id), 'corpora', str(corpus.id))
file.save(os.path.join(current_app.config['NOPAQUE_STORAGE'],
@@ -125,7 +125,10 @@ def add_corpus_file(corpus_id):
corpus_file.id))
thread.start()
flash('Corpus file added!')
return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
return make_response(
{'redirect_url': url_for('corpora.corpus', corpus_id=corpus.id)},
201)
# return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
return render_template('corpora/add_corpus_file.html.j2',
add_corpus_file_form=add_corpus_file_form,
corpus=corpus, title='Add corpus file')