sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-12-24 10:34:17 +00:00
Code Issues Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Patrick Jentsch 2021-12-01 16:03:55 +01:00
parent 12ec6be60b
commit 82745629bc
10 changed files with 83 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/corpora/cqi_over_socketio/__init__.py
View File

@ -1,4 +1,4 @@
from app import db, socketio from app import db, hashids, socketio
from app.decorators import socketio_login_required from app.decorators import socketio_login_required
from app.models import Corpus from app.models import Corpus
from flask import session from flask import session
@ -57,7 +57,7 @@ from .cqi import * # noqa
def connect(auth): def connect(auth):
# the auth variable is used in a hacky way. It contains the corpus id for # the auth variable is used in a hacky way. It contains the corpus id for
# which a corpus analysis session should be started. # which a corpus analysis session should be started.
corpus_id = auth['corpus_id'] corpus_id = hashids.decode(auth['corpus_id'])[0]
corpus = Corpus.query.get(corpus_id) corpus = Corpus.query.get(corpus_id)
if corpus is None: if corpus is None:
# return {'code': 404, 'msg': 'Not Found'} # return {'code': 404, 'msg': 'Not Found'}

5
app/events/sqlalchemy.py
View File

@ -28,6 +28,11 @@ def ressource_after_delete(mapper, connection, ressource):
@db.event.listens_for(QueryResult, 'after_insert') @db.event.listens_for(QueryResult, 'after_insert')
def ressource_after_insert_handler(mapper, connection, ressource): def ressource_after_insert_handler(mapper, connection, ressource):
value = ressource.to_dict(backrefs=False, relationships=False) value = ressource.to_dict(backrefs=False, relationships=False)
if isinstance(ressource, Job):
value['inputs'] = {}
value['results'] = {}
elif isinstance(ressource, Corpus):
value['files'] = {}
jsonpatch = [ jsonpatch = [
{'op': 'add', 'path': ressource.jsonpatch_path, 'value': value} {'op': 'add', 'path': ressource.jsonpatch_path, 'value': value}
] ]

5
app/models.py
View File

@ -544,7 +544,7 @@ class CorpusFile(FileMixin, HashidMixin, db.Model):
@property @property
def jsonpatch_path(self): def jsonpatch_path(self):
return f'/{self.corpus.jsonpatch_path}/files/{self.hashid}' return f'{self.corpus.jsonpatch_path}/files/{self.hashid}'
@property @property
def path(self): def path(self):
@ -601,6 +601,7 @@ class CorpusFile(FileMixin, HashidMixin, db.Model):
if backrefs: if backrefs:
dict_corpus_file['corpus'] = self.corpus.to_dict( dict_corpus_file['corpus'] = self.corpus.to_dict(
backrefs=True, relationships=False) backrefs=True, relationships=False)
return dict_corpus_file
class Corpus(HashidMixin, db.Model): class Corpus(HashidMixin, db.Model):
@ -705,7 +706,7 @@ class Corpus(HashidMixin, db.Model):
backrefs=True, relationships=False) backrefs=True, relationships=False)
if relationships: if relationships:
dict_corpus['files'] = { dict_corpus['files'] = {
x.id: x.to_dict(backrefs=False, relationships=True) x.hashid: x.to_dict(backrefs=False, relationships=True)
for x in self.files for x in self.files
} }
return dict_corpus return dict_corpus

26
app/static/js/nopaque/App.js
View File

@ -65,33 +65,9 @@ class App {
} }
usersPatchHandler(patch) { usersPatchHandler(patch) {
let jobId;
let listener; let listener;
let match;
let operation;
let re;
let relationship;
let ressourceId;
let userId;
for (operation of patch.filter(operation => operation.op === 'add')) { console.log(patch);
re = new RegExp(`^/users/([A-Za-z0-9]*)/corpora/([A-Za-z0-9]*)/(files)`);
if (re.test(operation.path)) {
[match, userId, ressourceId, relationship] = operation.path.match(re);
if (!(relationship in this.users[userId].corpora[ressourceId])) {
this.users[userId].corpora[ressourceId][relationship] = {};
}
continue;
}
re = new RegExp(`^/users/([A-Za-z0-9]*)/jobs/([A-Za-z0-9]*)/(inputs|results)`);
if (re.test(operation.path)) {
[match, userId, ressourceId, relationship] = operation.path.match(re);
if (!(relationship in this.users[userId].jobs[ressourceId])) {
this.users[userId].jobs[ressourceId][relationship] = {};
}
continue;
}
}
this.data = jsonpatch.apply_patch(this.data, patch); this.data = jsonpatch.apply_patch(this.data, patch);
for (listener of this.eventListeners['users.patch']) {listener(patch);} for (listener of this.eventListeners['users.patch']) {listener(patch);}
} }

69
app/static/js/nopaque/CorpusAnalysis/CQiClient.js
View File

@ -2,7 +2,11 @@ class CQiClient {
constructor(corpusId) { constructor(corpusId) {
this.socket = io( this.socket = io(
'/corpora/corpus/corpus_analysis', '/corpora/corpus/corpus_analysis',
{auth: {corpus_id: corpusId}, transports: ['websocket'], upgrade: false} {
auth: {corpus_id: corpusId},
transports: ['websocket'],
upgrade: false
}
); );
this.connected = false; this.connected = false;
this.corpora = new CQiCorpusCollection(this.socket); this.corpora = new CQiCorpusCollection(this.socket);
@ -55,7 +59,8 @@ class CQiCorpusCollection {
get(corpusName) { get(corpusName) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = {corpus_name: corpusName}; const args = {corpus_name: corpusName};
this.socket.emit('cqi.corpora.get', args, response => { this.socket.emit('cqi.corpora.get', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(new CQiCorpus(this.socket, response.payload)); resolve(new CQiCorpus(this.socket, response.payload));
@ -95,7 +100,8 @@ class CQiCorpus {
drop() { drop() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = {corpus_name: this.name}; const args = {corpus_name: this.name};
this.socket.emit('cqi.corpora.corpus.drop', args, response => { this.socket.emit('cqi.corpora.corpus.drop', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(response.payload); resolve(response.payload);
@ -108,11 +114,12 @@ class CQiCorpus {
query(subcorpus_name, queryString) { query(subcorpus_name, queryString) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = { const args = {
corpus_name: this.name, corpus_name: this.name,
subcorpus_name: subcorpus_name, subcorpus_name: subcorpus_name,
query: queryString query: queryString
}; };
this.socket.emit('cqi.corpora.corpus.query', args, response => { this.socket.emit('cqi.corpora.corpus.query', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(response.payload); resolve(response.payload);
@ -126,7 +133,8 @@ class CQiCorpus {
// nopaque specific CQi extension // nopaque specific CQi extension
paginate(page=1, perPage=20) { paginate(page=1, perPage=20) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = {corpus_name: this.name, page: page, per_page: perPage}; const args = {corpus_name: this.name, page: page, per_page: perPage};
this.socket.emit('cqi.corpora.corpus.paginate', args, response => { this.socket.emit('cqi.corpora.corpus.paginate', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(response.payload); resolve(response.payload);
@ -138,7 +146,8 @@ class CQiCorpus {
} }
updateDb() { updateDb() {
let args = {corpus_name: this.name}; const args = {corpus_name: this.name};
this.socket.emit('cqi.corpora.corpus.update_db', args); this.socket.emit('cqi.corpora.corpus.update_db', args);
} }
} }
@ -152,8 +161,11 @@ class CQiAlignmentAttributeCollection {
get(alignmentAttributeName) { get(alignmentAttributeName) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = {corpus_name: this.corpus.name, const args = {
alignment_attribute_name: alignmentAttributeName}; corpus_name: this.corpus.name,
alignment_attribute_name: alignmentAttributeName
};
this.socket.emit('cqi.corpora.corpus.alignment_attributes.get', args, response => { this.socket.emit('cqi.corpora.corpus.alignment_attributes.get', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(new CQiAlignmentAttribute(this.socket, this.corpus, response.payload)); resolve(new CQiAlignmentAttribute(this.socket, this.corpus, response.payload));
@ -166,7 +178,8 @@ class CQiAlignmentAttributeCollection {
list() { list() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = {corpus_name: this.corpus.name}; const args = {corpus_name: this.corpus.name};
this.socket.emit('cqi.corpus.alignment_attributes.list', args, response => { this.socket.emit('cqi.corpus.alignment_attributes.list', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(response.payload.map(x => {return new CQiAlignmentAttribute(this.socket, this.corpus, x);})); resolve(response.payload.map(x => {return new CQiAlignmentAttribute(this.socket, this.corpus, x);}));
@ -197,10 +210,11 @@ class CQiPositionalAttributeCollection {
get(positionalAttributeName) { get(positionalAttributeName) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = { const args = {
corpus_name: this.corpus.name, corpus_name: this.corpus.name,
positional_attribute_name: positionalAttributeName positional_attribute_name: positionalAttributeName
}; };
this.socket.emit('cqi.corpora.corpus.positional_attributes.get', args, response => { this.socket.emit('cqi.corpora.corpus.positional_attributes.get', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(new CQiPositionalAttribute(this.socket, this.corpus, response.payload)); resolve(new CQiPositionalAttribute(this.socket, this.corpus, response.payload));
@ -213,7 +227,8 @@ class CQiPositionalAttributeCollection {
list() { list() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = {corpus_name: this.corpus.name}; const args = {corpus_name: this.corpus.name};
this.socket.emit('cqi.corpus.positional_attributes.list', args, response => { this.socket.emit('cqi.corpus.positional_attributes.list', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(response.payload.map(x => {return new CQiPositionalAttribute(this.socket, this.corpus, x);})); resolve(response.payload.map(x => {return new CQiPositionalAttribute(this.socket, this.corpus, x);}));
@ -245,10 +260,11 @@ class CQiStructuralAttributeCollection {
get(structuralAttributeName) { get(structuralAttributeName) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = { const args = {
corpus_name: this.corpus.name, corpus_name: this.corpus.name,
structural_attribute_name: structuralAttributeName structural_attribute_name: structuralAttributeName
}; };
this.socket.emit('cqi.corpora.corpus.structural_attributes.get', args, response => { this.socket.emit('cqi.corpora.corpus.structural_attributes.get', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(new CQiStructuralAttribute(this.socket, this.corpus, response.payload)); resolve(new CQiStructuralAttribute(this.socket, this.corpus, response.payload));
@ -261,7 +277,8 @@ class CQiStructuralAttributeCollection {
list() { list() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = {corpus_name: this.corpus.name}; const args = {corpus_name: this.corpus.name};
this.socket.emit('cqi.corpus.structural_attributes.list', args, response => { this.socket.emit('cqi.corpus.structural_attributes.list', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(response.payload.map(x => {return new CQiStructuralAttribute(this.socket, this.corpus, x);})); resolve(response.payload.map(x => {return new CQiStructuralAttribute(this.socket, this.corpus, x);}));
@ -293,7 +310,10 @@ class CQiSubcorpusCollection {
get(subcorpusName) { get(subcorpusName) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = {corpus_name: this.corpus.name, subcorpus_name: subcorpusName}; const args = {
corpus_name: this.corpus.name,
subcorpus_name: subcorpusName
};
this.socket.emit('cqi.corpora.corpus.subcorpora.get', args, response => { this.socket.emit('cqi.corpora.corpus.subcorpora.get', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(new CQiSubcorpus(this.socket, this.corpus, response.payload)); resolve(new CQiSubcorpus(this.socket, this.corpus, response.payload));
@ -306,7 +326,8 @@ class CQiSubcorpusCollection {
list() { list() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = {corpus_name: this.corpus.name}; const args = {corpus_name: this.corpus.name};
this.socket.emit('cqi.corpora.corpus.subcorpora.list', args, response => { this.socket.emit('cqi.corpora.corpus.subcorpora.list', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(response.payload.map(x => {return new CQiSubcorpus(this.socket, this.corpus, x);})); resolve(response.payload.map(x => {return new CQiSubcorpus(this.socket, this.corpus, x);}));
@ -330,7 +351,8 @@ class CQiSubcorpus {
drop() { drop() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = {corpus_name: this.corpus.name, subcorpus_name: this.name}; const args = {corpus_name: this.corpus.name, subcorpus_name: this.name};
this.socket.emit('cqi.corpora.corpus.subcorpora.subcorpus.drop', args, response => { this.socket.emit('cqi.corpora.corpus.subcorpora.subcorpus.drop', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(response.payload); resolve(response.payload);
@ -343,13 +365,14 @@ class CQiSubcorpus {
dump(field, first, last) { dump(field, first, last) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = { const args = {
corpus_name: this.corpus.name, corpus_name: this.corpus.name,
subcorpus_name: this.name, subcorpus_name: this.name,
field: field, field: field,
first: first, first: first,
last: last last: last
}; };
this.socket.emit('cqi.corpora.corpus.subcorpora.subcorpus.dump', args, response => { this.socket.emit('cqi.corpora.corpus.subcorpora.subcorpus.dump', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(response.payload); resolve(response.payload);
@ -362,11 +385,12 @@ class CQiSubcorpus {
export(context=50) { export(context=50) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = { const args = {
corpus_name: this.corpus.name, corpus_name: this.corpus.name,
subcorpus_name: this.name, subcorpus_name: this.name,
context: context context: context
}; };
this.socket.emit('cqi.corpora.corpus.subcorpora.subcorpus.export', args, response => { this.socket.emit('cqi.corpora.corpus.subcorpora.subcorpus.export', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(response.payload); resolve(response.payload);
@ -379,13 +403,14 @@ class CQiSubcorpus {
fdst_1(cutoff, field, attribute) { fdst_1(cutoff, field, attribute) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = { const args = {
corpus_name: this.corpus.name, corpus_name: this.corpus.name,
subcorpus_name: this.name, subcorpus_name: this.name,
cutoff: cutoff, cutoff: cutoff,
field: field, field: field,
attribute: attribute attribute: attribute
}; };
this.socket.emit('cqi.corpora.corpus.subcorpora.subcorpus.fdist_1', args, response => { this.socket.emit('cqi.corpora.corpus.subcorpora.subcorpus.fdist_1', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(response.payload); resolve(response.payload);
@ -398,7 +423,7 @@ class CQiSubcorpus {
fdst_2(cutoff, field1, attribute1, field2, attribute2) { fdst_2(cutoff, field1, attribute1, field2, attribute2) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = { const args = {
corpus_name: this.corpus.name, corpus_name: this.corpus.name,
subcorpus_name: this.name, subcorpus_name: this.name,
cutoff: cutoff, cutoff: cutoff,
@ -407,6 +432,7 @@ class CQiSubcorpus {
field2: field2, field2: field2,
attribute2: attribute2 attribute2: attribute2
}; };
this.socket.emit('cqi.corpora.corpus.subcorpora.subcorpus.fdist_1', args, response => { this.socket.emit('cqi.corpora.corpus.subcorpora.subcorpus.fdist_1', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(response.payload); resolve(response.payload);
@ -420,13 +446,14 @@ class CQiSubcorpus {
// nopaque specific CQi extension // nopaque specific CQi extension
paginate(page=1, perPage=20, context=50) { paginate(page=1, perPage=20, context=50) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let args = { const args = {
corpus_name: this.corpus.name, corpus_name: this.corpus.name,
subcorpus_name: this.name, subcorpus_name: this.name,
page: page, page: page,
per_page: perPage, per_page: perPage,
context: context context: context
}; };
this.socket.emit('cqi.corpora.corpus.subcorpora.subcorpus.paginate', args, response => { this.socket.emit('cqi.corpora.corpus.subcorpora.subcorpus.paginate', args, response => {
if (response.code === 200) { if (response.code === 200) {
resolve(response.payload); resolve(response.payload);

2
app/static/js/nopaque/CorpusAnalysis/CorpusAnalysisApp.js
View File

@ -69,7 +69,7 @@ class CorpusAnalysisApp {
this.elements.initError.classList.remove('hide'); this.elements.initError.classList.remove('hide');
this.elements.initProgress.classList.add('hide'); this.elements.initProgress.classList.add('hide');
if ('payload' in cQiError && 'code' in cQiError.payload && 'msg' in cQiError.payload) { if ('payload' in cQiError && 'code' in cQiError.payload && 'msg' in cQiError.payload) {
nopaque.appClient.flash(`${cQiError.payload.code}: ${cQiError.payload.msg}`, 'error'); app.flash(`${cQiError.payload.code}: ${cQiError.payload.msg}`, 'error');
} }
} }
); );

6
app/static/js/nopaque/CorpusAnalysis/CorpusAnalysisConcordance.js
View File

@ -71,7 +71,7 @@ class CorpusAnalysisConcordance {
this.elements.error.innerText = JSON.stringify(cQiError); this.elements.error.innerText = JSON.stringify(cQiError);
this.elements.error.classList.remove('hide'); this.elements.error.classList.remove('hide');
if ('payload' in cQiError && 'code' in cQiError.payload && 'msg' in cQiError.payload) { if ('payload' in cQiError && 'code' in cQiError.payload && 'msg' in cQiError.payload) {
nopaque.appClient.flash(`${cQiError.payload.code}: ${cQiError.payload.msg}`, 'error'); app.flash(`${cQiError.payload.code}: ${cQiError.payload.msg}`, 'error');
} }
this.elements.progress.classList.add('hide'); this.elements.progress.classList.add('hide');
this.app.enableActionElements(); this.app.enableActionElements();
@ -166,7 +166,7 @@ class CorpusAnalysisConcordance {
let subcorpus = this.data.subcorpora[this.settings.selectedSubcorpus]; let subcorpus = this.data.subcorpora[this.settings.selectedSubcorpus];
subcorpus.o.drop().then( subcorpus.o.drop().then(
cQiStatus => { cQiStatus => {
nopaque.appClient.flash(`${subcorpus.o.name} deleted`, 'corpus'); app.flash(`${subcorpus.o.name} deleted`, 'corpus');
delete this.data.subcorpora[subcorpus.o.name]; delete this.data.subcorpora[subcorpus.o.name];
this.settings.selectedSubcorpus = undefined; this.settings.selectedSubcorpus = undefined;
for (let subcorpusName in this.data.subcorpora) { for (let subcorpusName in this.data.subcorpora) {
@ -187,7 +187,7 @@ class CorpusAnalysisConcordance {
} }
}, },
cQiError => { cQiError => {
nopaque.appClient.flash(`${cQiError.payload.code}: ${cQiError.payload.msg}`, 'error'); app.flash(`${cQiError.payload.code}: ${cQiError.payload.msg}`, 'error');
} }
); );
}); });

25
app/static/js/nopaque/CorpusAnalysis/CorpusAnalysisReader.js
View File

@ -49,7 +49,7 @@ class CorpusAnalysisReader {
this.elements.error.innerText = JSON.stringify(error); this.elements.error.innerText = JSON.stringify(error);
this.elements.error.classList.remove('hide'); this.elements.error.classList.remove('hide');
if ('payload' in error && 'code' in error.payload && 'msg' in error.payload) { if ('payload' in error && 'code' in error.payload && 'msg' in error.payload) {
nopaque.appClient.flash(`${error.payload.code}: ${error.payload.msg}`, 'error'); app.flash(`${error.payload.code}: ${error.payload.msg}`, 'error');
} }
this.elements.progress.classList.add('hide'); this.elements.progress.classList.add('hide');
this.app.enableActionElements(); this.app.enableActionElements();
@ -75,8 +75,12 @@ class CorpusAnalysisReader {
} }
clearCorpus() { clearCorpus() {
let pAttrElement;
let pAttrElements;
// Destroy with .p-attr elements associated Materialize tooltips // Destroy with .p-attr elements associated Materialize tooltips
for (let pAttrElement of this.elements.corpus.querySelectorAll('.p-attr.tooltipped')) { pAttrElements = this.elements.corpus.querySelectorAll('.p-attr.tooltipped');
for (pAttrElement of pAttrElements) {
M.Tooltip.getInstance(pAttrElement)?.destroy(); M.Tooltip.getInstance(pAttrElement)?.destroy();
} }
this.elements.corpus.innerHTML = ` this.elements.corpus.innerHTML = `
@ -88,8 +92,10 @@ class CorpusAnalysisReader {
} }
renderCorpus() { renderCorpus() {
let item;
this.clearCorpus(); this.clearCorpus();
let item = this.data.corpus.p.items[0]; item = this.data.corpus.p.items[0];
this.elements.corpus.innerHTML += ` this.elements.corpus.innerHTML += `
<p>${this.cposRange2HTML(item[0], item[item.length - 1])}</p> <p>${this.cposRange2HTML(item[0], item[item.length - 1])}</p>
`.trim(); `.trim();
@ -103,6 +109,10 @@ class CorpusAnalysisReader {
} }
renderCorpusPagination() { renderCorpusPagination() {
let i;
let page;
let paginateTriggerElement;
this.clearCorpusPagination(); this.clearCorpusPagination();
if (this.data.corpus.p.pages === 0) {return;} if (this.data.corpus.p.pages === 0) {return;}
this.elements.corpusPagination.innerHTML += ` this.elements.corpusPagination.innerHTML += `
@ -119,7 +129,7 @@ class CorpusAnalysisReader {
</a> </a>
</li> </li>
`.trim(); `.trim();
for (let i = 1; i <= this.data.corpus.p.pages; i++) { for (i = 1; i <= this.data.corpus.p.pages; i++) {
this.elements.corpusPagination.innerHTML += ` this.elements.corpusPagination.innerHTML += `
<li class="${i === this.data.corpus.p.page ? 'active' : 'waves-effect'}"> <li class="${i === this.data.corpus.p.page ? 'active' : 'waves-effect'}">
<a class="corpus-analysis-action pagination-trigger" ${i === this.data.corpus.p.page ? '' : 'data-target="' + i + '"'}>${i}</a> <a class="corpus-analysis-action pagination-trigger" ${i === this.data.corpus.p.page ? '' : 'data-target="' + i + '"'}>${i}</a>
@ -140,10 +150,10 @@ class CorpusAnalysisReader {
</a> </a>
</li> </li>
`.trim(); `.trim();
for (let paginateTriggerElement of this.elements.corpusPagination.querySelectorAll('.pagination-trigger[data-target]')) { for (paginateTriggerElement of this.elements.corpusPagination.querySelectorAll('.pagination-trigger[data-target]')) {
paginateTriggerElement.addEventListener('click', event => { paginateTriggerElement.addEventListener('click', event => {
event.preventDefault(); event.preventDefault();
let page = parseInt(paginateTriggerElement.dataset.target); page = parseInt(paginateTriggerElement.dataset.target);
this.page(page); this.page(page);
}); });
} }
@ -151,10 +161,11 @@ class CorpusAnalysisReader {
} }
cposRange2HTML(firstCpos, lastCpos) { cposRange2HTML(firstCpos, lastCpos) {
let cpos;
let prevPAttr, pAttr, nextPAttr; let prevPAttr, pAttr, nextPAttr;
let isEntityStart, isEntityEnd; let isEntityStart, isEntityEnd;
let html = ''; let html = '';
for (let cpos = firstCpos; cpos <= lastCpos; cpos++) { for (cpos = firstCpos; cpos <= lastCpos; cpos++) {
prevPAttr = cpos > firstCpos ? this.data.corpus.p.lookups.cpos_lookup[cpos - 1] : null; prevPAttr = cpos > firstCpos ? this.data.corpus.p.lookups.cpos_lookup[cpos - 1] : null;
pAttr = this.data.corpus.p.lookups.cpos_lookup[cpos]; pAttr = this.data.corpus.p.lookups.cpos_lookup[cpos];
nextPAttr = cpos < lastCpos ? this.data.corpus.p.lookups.cpos_lookup[cpos + 1] : null; nextPAttr = cpos < lastCpos ? this.data.corpus.p.lookups.cpos_lookup[cpos + 1] : null;

1
app/static/js/nopaque/RessourceLists/CorpusFileList.js
View File

@ -5,6 +5,7 @@ class CorpusFileList extends RessourceList {
} }
init(user) { init(user) {
console.log(user);
this._init(user.corpora[this.corpusId].files); this._init(user.corpora[this.corpusId].files);
} }

2
app/templates/corpora/analyse_corpus.html.j2
View File

@ -65,7 +65,7 @@
<script src="{{ ASSET_URL }}"></script> <script src="{{ ASSET_URL }}"></script>
{% endassets %} {% endassets %}
<script> <script>
let corpusAnalysisApp = new CorpusAnalysisApp({{ corpus.id }}); let corpusAnalysisApp = new CorpusAnalysisApp('{{ corpus.hashid }}');
let corpusAnalysisConcordance = new CorpusAnalysisConcordance(corpusAnalysisApp); let corpusAnalysisConcordance = new CorpusAnalysisConcordance(corpusAnalysisApp);
let corpusAnalysisReader = new CorpusAnalysisReader(corpusAnalysisApp); let corpusAnalysisReader = new CorpusAnalysisReader(corpusAnalysisApp);
corpusAnalysisApp.init(); corpusAnalysisApp.init();