mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-11-03 20:02:47 +00:00 
			
		
		
		
	rename blueprint variables (blueprint_name -> bp) and view files (views.py -> routes.py)
This commit is contained in:
		@@ -1,5 +1,5 @@
 | 
			
		||||
from flask import Blueprint
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
corpora = Blueprint('corpora', __name__)
 | 
			
		||||
from . import events, views  # noqa
 | 
			
		||||
bp = Blueprint('corpora', __name__)
 | 
			
		||||
from . import events, routes  # noqa
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
from flask import (abort, flash, make_response, redirect, request,
 | 
			
		||||
                   render_template, url_for, send_from_directory)
 | 
			
		||||
from flask_login import current_user, login_required
 | 
			
		||||
from . import corpora
 | 
			
		||||
from . import bp
 | 
			
		||||
from . import tasks
 | 
			
		||||
from .forms import (AddCorpusFileForm, AddCorpusForm, AddQueryResultForm,
 | 
			
		||||
                    EditCorpusFileForm, QueryDownloadForm, QueryForm,
 | 
			
		||||
@@ -20,7 +20,7 @@ from zipfile import ZipFile
 | 
			
		||||
from .import_corpus import check_zip_contents
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/add', methods=['GET', 'POST'])
 | 
			
		||||
@bp.route('/add', methods=['GET', 'POST'])
 | 
			
		||||
@login_required
 | 
			
		||||
def add_corpus():
 | 
			
		||||
    form = AddCorpusForm()
 | 
			
		||||
@@ -45,7 +45,7 @@ def add_corpus():
 | 
			
		||||
                           title='Add corpus')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/import', methods=['GET', 'POST'])
 | 
			
		||||
@bp.route('/import', methods=['GET', 'POST'])
 | 
			
		||||
@login_required
 | 
			
		||||
def import_corpus():
 | 
			
		||||
    form = ImportCorpusForm()
 | 
			
		||||
@@ -114,7 +114,7 @@ def import_corpus():
 | 
			
		||||
                           title='Import Corpus')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/<int:corpus_id>')
 | 
			
		||||
@bp.route('/<int:corpus_id>')
 | 
			
		||||
@login_required
 | 
			
		||||
def corpus(corpus_id):
 | 
			
		||||
    corpus = Corpus.query.get_or_404(corpus_id)
 | 
			
		||||
@@ -125,7 +125,7 @@ def corpus(corpus_id):
 | 
			
		||||
                           corpus_files=corpus_files, title='Corpus')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/<int:corpus_id>/download')
 | 
			
		||||
@bp.route('/<int:corpus_id>/download')
 | 
			
		||||
@login_required
 | 
			
		||||
def download_corpus(corpus_id):
 | 
			
		||||
    corpus = Corpus.query.get_or_404(corpus_id)
 | 
			
		||||
@@ -139,7 +139,7 @@ def download_corpus(corpus_id):
 | 
			
		||||
    )
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/<int:corpus_id>/analyse')
 | 
			
		||||
@bp.route('/<int:corpus_id>/analyse')
 | 
			
		||||
@login_required
 | 
			
		||||
def analyse_corpus(corpus_id):
 | 
			
		||||
    corpus = Corpus.query.get_or_404(corpus_id)
 | 
			
		||||
@@ -164,7 +164,7 @@ def analyse_corpus(corpus_id):
 | 
			
		||||
    )
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/<int:corpus_id>/delete')
 | 
			
		||||
@bp.route('/<int:corpus_id>/delete')
 | 
			
		||||
@login_required
 | 
			
		||||
def delete_corpus(corpus_id):
 | 
			
		||||
    corpus = Corpus.query.get_or_404(corpus_id)
 | 
			
		||||
@@ -175,7 +175,7 @@ def delete_corpus(corpus_id):
 | 
			
		||||
    return redirect(url_for('main.dashboard'))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/<int:corpus_id>/files/add', methods=['GET', 'POST'])
 | 
			
		||||
@bp.route('/<int:corpus_id>/files/add', methods=['GET', 'POST'])
 | 
			
		||||
@login_required
 | 
			
		||||
def add_corpus_file(corpus_id):
 | 
			
		||||
    corpus = Corpus.query.get_or_404(corpus_id)
 | 
			
		||||
@@ -210,7 +210,7 @@ def add_corpus_file(corpus_id):
 | 
			
		||||
                           form=form, title='Add corpus file')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/<int:corpus_id>/files/<int:corpus_file_id>/delete')
 | 
			
		||||
@bp.route('/<int:corpus_id>/files/<int:corpus_file_id>/delete')
 | 
			
		||||
@login_required
 | 
			
		||||
def delete_corpus_file(corpus_id, corpus_file_id):
 | 
			
		||||
    corpus_file = CorpusFile.query.get_or_404(corpus_file_id)
 | 
			
		||||
@@ -224,7 +224,7 @@ def delete_corpus_file(corpus_id, corpus_file_id):
 | 
			
		||||
    return redirect(url_for('.corpus', corpus_id=corpus_id))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/<int:corpus_id>/files/<int:corpus_file_id>/download')
 | 
			
		||||
@bp.route('/<int:corpus_id>/files/<int:corpus_file_id>/download')
 | 
			
		||||
@login_required
 | 
			
		||||
def download_corpus_file(corpus_id, corpus_file_id):
 | 
			
		||||
    corpus_file = CorpusFile.query.get_or_404(corpus_file_id)
 | 
			
		||||
@@ -238,8 +238,7 @@ def download_corpus_file(corpus_id, corpus_file_id):
 | 
			
		||||
                               filename=corpus_file.filename)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/<int:corpus_id>/files/<int:corpus_file_id>',
 | 
			
		||||
               methods=['GET', 'POST'])
 | 
			
		||||
@bp.route('/<int:corpus_id>/files/<int:corpus_file_id>', methods=['GET', 'POST'])
 | 
			
		||||
@login_required
 | 
			
		||||
def corpus_file(corpus_id, corpus_file_id):
 | 
			
		||||
    corpus = Corpus.query.get_or_404(corpus_id)
 | 
			
		||||
@@ -284,7 +283,7 @@ def corpus_file(corpus_id, corpus_file_id):
 | 
			
		||||
                           title='Edit corpus file')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/<int:corpus_id>/prepare')
 | 
			
		||||
@bp.route('/<int:corpus_id>/prepare')
 | 
			
		||||
@login_required
 | 
			
		||||
def prepare_corpus(corpus_id):
 | 
			
		||||
    corpus = Corpus.query.get_or_404(corpus_id)
 | 
			
		||||
@@ -299,7 +298,7 @@ def prepare_corpus(corpus_id):
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Following are view functions to add, view etc. exported results.
 | 
			
		||||
@corpora.route('/result/add', methods=['GET', 'POST'])
 | 
			
		||||
@bp.route('/result/add', methods=['GET', 'POST'])
 | 
			
		||||
@login_required
 | 
			
		||||
def add_query_result():
 | 
			
		||||
    '''
 | 
			
		||||
@@ -350,7 +349,7 @@ def add_query_result():
 | 
			
		||||
                           form=form, title='Add query result')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/result/<int:query_result_id>')
 | 
			
		||||
@bp.route('/result/<int:query_result_id>')
 | 
			
		||||
@login_required
 | 
			
		||||
def query_result(query_result_id):
 | 
			
		||||
    query_result = QueryResult.query.get_or_404(query_result_id)
 | 
			
		||||
@@ -361,7 +360,7 @@ def query_result(query_result_id):
 | 
			
		||||
                           query_result=query_result, title='Query result')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/result/<int:query_result_id>/inspect')
 | 
			
		||||
@bp.route('/result/<int:query_result_id>/inspect')
 | 
			
		||||
@login_required
 | 
			
		||||
def inspect_query_result(query_result_id):
 | 
			
		||||
    '''
 | 
			
		||||
@@ -391,7 +390,7 @@ def inspect_query_result(query_result_id):
 | 
			
		||||
                           title='Inspect query result')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/result/<int:query_result_id>/delete')
 | 
			
		||||
@bp.route('/result/<int:query_result_id>/delete')
 | 
			
		||||
@login_required
 | 
			
		||||
def delete_query_result(query_result_id):
 | 
			
		||||
    query_result = QueryResult.query.get_or_404(query_result_id)
 | 
			
		||||
@@ -403,7 +402,7 @@ def delete_query_result(query_result_id):
 | 
			
		||||
    return redirect(url_for('services.service', service="corpus_analysis"))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@corpora.route('/result/<int:query_result_id>/download')
 | 
			
		||||
@bp.route('/result/<int:query_result_id>/download')
 | 
			
		||||
@login_required
 | 
			
		||||
def download_query_result(query_result_id):
 | 
			
		||||
    query_result = QueryResult.query.get_or_404(query_result_id)
 | 
			
		||||
		Reference in New Issue
	
	Block a user