diff --git a/web/app/corpora/events.py b/web/app/corpora/events.py
index e941ba5b04d3bd73ac947008b9c49ae8a74c32bc..3a36e9d3e4d8ed970ca411deb9eac9e15fdd1cfa 100644
--- a/web/app/corpora/events.py
+++ b/web/app/corpora/events.py
@@ -9,6 +9,8 @@ import cqi
import math
from datetime import datetime
+import time
+from app import logger
'''
' A dictionary containing lists of, with corpus ids associated, Socket.IO
@@ -141,9 +143,9 @@ def corpus_analysis_query(query):
client.status = 'ready'
-@socketio.on('corpus_analysis_inspect_match')
+@socketio.on('corpus_analysis_get_match_with_full_context')
@socketio_login_required
-def corpus_analysis_inspect_match(payload):
+def corpus_analysis_get_match_with_full_context(payload):
type = payload['type']
data_indexes = payload['data_indexes']
first_cpos = payload['first_cpos']
@@ -155,7 +157,7 @@ def corpus_analysis_inspect_match(payload):
'msg': 'Failed Dependency',
'type': type,
'data_indexes': data_indexes}
- socketio.emit('corpus_analysis_inspect_match', response,
+ socketio.emit('corpus_analysis_get_match_with_full_context', response,
room=request.sid)
return
if client.status == 'running':
@@ -170,12 +172,29 @@ def corpus_analysis_inspect_match(payload):
payload['matches'] = []
payload['cpos_lookup'] = {}
payload['text_lookup'] = {}
+ payload['cpos_ranges'] = True
+ payload['progress'] = 0
+ i = 0
+ # Send data one match at a time.
for index, f_cpos, l_cpos in zip(data_indexes, first_cpos, last_cpos):
+ logger.warning(index)
+ i += 1
tmp_match = s.export(f_cpos, l_cpos, context=10)
payload['matches'].append(tmp_match['matches'][0])
payload['cpos_lookup'].update(tmp_match['cpos_lookup'])
payload['text_lookup'].update(tmp_match['text_lookup'])
- payload['cpos_ranges'] = True
+ payload['progress'] = i/len(data_indexes)*100
+ response = {'code': 200,
+ 'desc': None,
+ 'msg': 'OK',
+ 'payload': payload,
+ 'type': type,
+ 'data_indexes': data_indexes}
+ socketio.emit('corpus_analysis_get_match_with_full_context',
+ response, room=request.sid)
+ payload['matches'] = []
+ payload['cpos_lookup'] = {}
+ payload['text_lookup'] = {}
except cqi.errors.CQiException as e:
payload = {'code': e.code, 'desc': e.description, 'msg': e.name}
response = {'code': 500,
@@ -184,14 +203,7 @@ def corpus_analysis_inspect_match(payload):
'payload': payload,
'type': type,
'data_indexes': data_indexes}
- else:
- response = {'code': 200,
- 'desc': None,
- 'msg': 'OK',
- 'payload': payload,
- 'type': type,
- 'data_indexes': data_indexes}
- socketio.emit('corpus_analysis_inspect_match', response, room=request.sid)
+ socketio.emit('corpus_analysis_get_match_with_full_context', response, room=request.sid)
client.status = 'ready'
diff --git a/web/app/static/js/modules/corpus_analysis/client/Client.js b/web/app/static/js/modules/corpus_analysis/client/Client.js
index 14c82392eb24115068e7730d8e0601230e50994c..9dff66bad43dc8f16451efb02040512264cccc85 100644
--- a/web/app/static/js/modules/corpus_analysis/client/Client.js
+++ b/web/app/static/js/modules/corpus_analysis/client/Client.js
@@ -126,7 +126,7 @@ class Client {
tmp_first_cpos.push(results.data.matches[dataIndex].c[0]);
tmp_last_cpos.push(results.data.matches[dataIndex].c[1]);
}
- nopaque.socket.emit("corpus_analysis_inspect_match",
+ nopaque.socket.emit("corpus_analysis_get_match_with_full_context",
{type: resultsType,
data_indexes: dataIndexes,
first_cpos: tmp_first_cpos,
@@ -135,6 +135,7 @@ class Client {
//
getResultsDataWithoutContext(resultsType, dataIndexes, results, resultsList) {
+ this.notifyView('results-data-recieving', {fullContext: false});
let objectKey = '';
if (resultsType === 'full-results') {
console.info('Saving full-results data without full context.');
@@ -159,12 +160,10 @@ class Client {
}
// Get cpos_lookups from cposes.
let cpos_lookup = {};
- let single_lookup = {};
let textIds = new Set;
for (let single_cpos of cpos) {
- single_lookup[single_cpos] = results.data.cpos_lookup[single_cpos];
- textIds.add(single_lookup[single_cpos].text);
- Object.assign(cpos_lookup, single_lookup);
+ textIds.add(results.data.cpos_lookup[single_cpos].text);
+ Object.assign(cpos_lookup, { [single_cpos]: results.data.cpos_lookup[single_cpos]});
}
let text = {};
let text_lookup = {};
@@ -189,7 +188,8 @@ class Client {
console.info('Results data without context has been saved.', results);
this.isBusy = false;
this.notifyView('results-data-recieved', {type: resultsType,
- results: results});
+ results: results,
+ fullContext: false});
}
}
diff --git a/web/app/static/js/modules/corpus_analysis/client/callbacks.js b/web/app/static/js/modules/corpus_analysis/client/callbacks.js
index 00ad293488a3c95739c03006039e2faf4013de31..f2793d2da08a164349a02a3d8b074e6343b9f5f3 100644
--- a/web/app/static/js/modules/corpus_analysis/client/callbacks.js
+++ b/web/app/static/js/modules/corpus_analysis/client/callbacks.js
@@ -73,11 +73,11 @@ function saveQueryData() {
function getResultsData() {
let [resultsType, dataIndexes, resultsList, client, results, rest] = arguments;
client.isBusy = true;
- client.notifyView('results-data-recieving');
if (resultsList.exportFullInspectContext.checked || resultsType === 'inspect-results') {
- console.log('Get with full context');
+ console.info('Get results with full context');
client.getResultsData(resultsType, dataIndexes, results);
} else {
+ console.info('Get results without full context');
client.getResultsDataWithoutContext(resultsType, dataIndexes, results,
resultsList);
}
@@ -96,21 +96,26 @@ function saveResultsData() {
objectKey = 'inspectResultsData'
console.info('Saving inspect-results data');
}
- // Save incoming data
- results[objectKey].init();
+ // Save incoming data. Data is incoming one match at a time.
results[objectKey].matches.push(...payload.matches);
results[objectKey].addData(payload.cpos_lookup, "cpos_lookup");
results[objectKey].addData(payload.text_lookup, "text_lookup");
results[objectKey].addData(results.metaData);
results[objectKey].query = results.data.query;
results[objectKey].corpus_type = type;
- results[objectKey].match_count = [...payload.matches].length;
+ results[objectKey].match_count += 1;
results[objectKey].cpos_ranges = payload.cpos_ranges;
results[objectKey].fullContext = true;
console.info('Results data has been saved.', results);
+ // Notify view to update progress bar
+ client.notifyView('results-data-recieving', {type: type,
+ progress: payload.progress})
client.isBusy = false;
- client.notifyView('results-data-recieved', {type: type,
- results: results});
+ if (payload.progress === 100) {
+ client.notifyView('results-data-recieved', {type: type,
+ results: results,
+ fullContext: true});
+ }
}
// export callbacks
diff --git a/web/app/static/js/modules/corpus_analysis/client/listeners.js b/web/app/static/js/modules/corpus_analysis/client/listeners.js
index 883c639e193801397e06d9586eeb97ac9c1c49d2..6fa0a28576846485b21900fa102cb43ae8879fd5 100644
--- a/web/app/static/js/modules/corpus_analysis/client/listeners.js
+++ b/web/app/static/js/modules/corpus_analysis/client/listeners.js
@@ -147,9 +147,9 @@ function recieveResultsData(type, client) {
*/
if (response.code === 200) {
console.group('Client recieving results data')
- console.info('corpus_analysis_inspect_match: Client recieving results data',
+ console.info('corpus_analysis_get_match_with_full_context: Client recieving results data',
'via socket.on');
- console.info(`corpus_analysis_inspect_match: ${response.code} - ${response.msg}`);
+ console.info(`corpus_analysis_get_match_with_full_context: ${response.code} - ${response.msg}`);
console.info(response);
// executing the registered callbacks
client.eventListeners[type].executeCallbacks([response.payload,
@@ -158,9 +158,9 @@ function recieveResultsData(type, client) {
} else {
let errorText = `Error ${response.payload.code} - ${response.payload.msg}`;
console.group('Failed to recieve results data.');
- console.error('corpus_analysis_inspect_match: Client failed to recieve',
+ console.error('corpus_analysis_get_match_with_full_context: Client failed to recieve',
'results data via socket.on');
- console.error(`corpus_analysis_inspect_match: ${errorText}`);
+ console.error(`corpus_analysis_get_match_with_full_context: ${errorText}`);
client.notifyView('client-failed', { msg: errorText }, 'error');
console.groupEnd();
}
diff --git a/web/app/static/js/modules/corpus_analysis/view/ResultsView.js b/web/app/static/js/modules/corpus_analysis/view/ResultsView.js
index 0da1a86e5fb1c2b68a562f6d2a13d0d752bcd344..fd10e05683ec605d84aac99b99d8744501901ea2 100644
--- a/web/app/static/js/modules/corpus_analysis/view/ResultsView.js
+++ b/web/app/static/js/modules/corpus_analysis/view/ResultsView.js
@@ -219,7 +219,7 @@ class ResultsList extends List {
// Used in addToSubResults and inspect to toggle the design of the check
// buttons according to its checked unchecked status.
helperActivateAddBtn(btn) {
- btn.classList.remove("grey");
+ btn.classList.remove("corpus-analysis-color.lighten");
btn.classList.add("green");
btn.textContent = "check";
}
@@ -228,7 +228,7 @@ class ResultsList extends List {
// buttons according to its checked unchecked status.
helperDeactivateAddBtn(btn) {
btn.classList.remove("green");
- btn.classList.add("grey");
+ btn.classList.add("corpus-analysis-color.lighten");
btn.textContent = "add";
}
@@ -344,7 +344,7 @@ class ResultsList extends List {
this.contextModal.open();
// add a button to add this match to sub results with onclick event
let classes = `btn-floating btn waves-effect` +
- ` waves-light grey right`
+ ` waves-light corpus-analysis-color.lighten right`
let addToSubResultsIdsBtn = document.createElement("a");
addToSubResultsIdsBtn.setAttribute("class", classes + ` add`);
addToSubResultsIdsBtn.innerHTML = '<i class="material-icons">add</i>';
@@ -722,7 +722,7 @@ class ResultsList extends List {
// # some btn css rules and classes
let css = `margin-right: 5px; margin-bottom: 5px;`
let classes = `btn-floating btn waves-effect` +
- ` waves-light grey`
+ ` waves-light corpus-analysis-color.lighten`
// # add button to trigger more context to every match td
inspectBtn = document.createElement("a");
inspectBtn.setAttribute("style", css);
diff --git a/web/app/static/js/modules/corpus_analysis/view/callbacks.js b/web/app/static/js/modules/corpus_analysis/view/callbacks.js
index 25d4e06caeb17a16c7704f136b79a07fe7ec1153..09d0d8294873062c1f229c6543c1f75dc29776e0 100644
--- a/web/app/static/js/modules/corpus_analysis/view/callbacks.js
+++ b/web/app/static/js/modules/corpus_analysis/view/callbacks.js
@@ -151,11 +151,26 @@ function queryDataRecievedCallback(resultsList, detail) {
}
function resultsDataRecievingCallback(resultsList, detail) {
+ resultsList.getHTMLElements([
+ '#full-results-progress-bar',
+ '#sub-results-progress-bar',
+ ]);
+ // Disable the full context switch when results are being recieved
+ resultsList.exportFullInspectContext.setAttribute('disabled', '');
+ if (detail.type === 'full-results' && detail.progress) {
+ resultsList.fullResultsProgressBar.firstElementChild.style.width = `${detail.progress}%`;
+ resultsList.fullResultsProgressBar.classList.toggle('hide', false);
+ } else if (detail.type === 'sub-results' && detail.progress) {
+ resultsList.subResultsProgressBar.firstElementChild.style.width = `${detail.progress}%`;
+ resultsList.subResultsProgressBar.classList.toggle('hide', false);
+ }
}
function resultsDataRecievedCallback(resultsList, detail) {
// create strings for create buttons depending on type
const handleType = (keyPrefix, text) => {
+ // Enable the full context switch when results have been recieved
+ resultsList.exportFullInspectContext.removeAttribute('disabled', '');
// hides the create element after results have been recieved and reset it
resultsList[`${keyPrefix}Create`].classList.toggle('hide');
resultsList[`${keyPrefix}Create`].textContent = `Create ${text}`;
@@ -171,8 +186,16 @@ function resultsDataRecievedCallback(resultsList, detail) {
}
if (detail.type === 'full-results') {
handleType('fullResults', 'Results');
+ if (detail.fullContext) {
+ resultsList.fullResultsProgressBar.firstElementChild.style.width = `0%`;
+ resultsList.fullResultsProgressBar.classList.toggle('hide', true);
+ }
} else if (detail.type ==='sub-results') {
handleType('subResults', 'Sub-Results');
+ if (detail.fullContext) {
+ resultsList.subResultsProgressBar.firstElementChild.style.width = `0%`;
+ resultsList.subResultsProgressBar.classList.toggle('hide', true);
+ }
} else if (detail.type ==='inspect-results') {
if (resultsList.addToSubResultsIdsToShow.size === 0) {
/**
diff --git a/web/app/static/js/nopaque.callbacks.js b/web/app/static/js/nopaque.callbacks.js
index a3a9b8708b1d0cce6129f8ab4fb653ca590a08b0..8b78338d5244bb90e33d1f6778f57ef54ad37ab4 100644
--- a/web/app/static/js/nopaque.callbacks.js
+++ b/web/app/static/js/nopaque.callbacks.js
@@ -5,7 +5,7 @@ function recvMetaData(payload) {
console.log("Metada recieved:", results.metaData);
}
-// This callback is called in socket.on "corpus_analysis_inspect_match" but
+// This callback is called in socket.on "corpus_analysis_get_match_with_full_context" but
// only if the response.type is "sub-results".
// Saves the incoming inspect match results into results.subResultsData.
function saveSubResultsChoices(response) {
diff --git a/web/app/templates/corpora/analyse_corpus.html.j2 b/web/app/templates/corpora/analyse_corpus.html.j2
index e42db070bedb37b7d815ee1d4c56112edc2b2aad..05b4ea7c83a0bdaaf483348eb9a64de8cd883ca4 100644
--- a/web/app/templates/corpora/analyse_corpus.html.j2
+++ b/web/app/templates/corpora/analyse_corpus.html.j2
@@ -3,9 +3,9 @@
{% set headline = ' ' %}
{% set full_width = True %}
-{% set imported = False %}
{% block page_content %}
+{{ Macros.insert_color_scheme(corpus_analysis_color_darken) }}
<div class="col s12">
<div class="card">
<div class="card-content" style="padding-top: 5px;
@@ -168,9 +168,9 @@ document.addEventListener("DOMContentLoaded", () => {
saveQueryData,
[client, results]);
listenForQueryData.setCallbacks([queryDataCallback]);
- const listenForResults = new ClientEventListener('corpus_analysis_inspect_match',
+ const listenForResults = new ClientEventListener('corpus_analysis_get_match_with_full_context',
recieveResultsData);
- const resultsDataCallback = new ListenerCallback('corpus_analysis_inspect_match',
+ const resultsDataCallback = new ListenerCallback('corpus_analysis_get_match_with_full_context',
saveResultsData,
[client, results]);
listenForResults.setCallbacks([resultsDataCallback]);
@@ -352,6 +352,8 @@ document.addEventListener("DOMContentLoaded", () => {
resultsList.fullResultsCreate.insertAdjacentHTML('afterbegin',
loadingSpinnerHTML);
let dataIndexes = [...Array(results.data.match_count).keys()];
+ // Empty fullResultsData so that no previous data is used.
+ results.fullResultsData.init();
resultsList.notifyClient('get-results', { resultsType: 'full-results',
dataIndexes: dataIndexes,
resultsList: resultsList,
@@ -367,6 +369,8 @@ document.addEventListener("DOMContentLoaded", () => {
resultsList.subResultsCreate.innerText = 'Creating...';
resultsList.subResultsCreate.insertAdjacentHTML('afterbegin',
loadingSpinnerHTML);
+ // Empty subResultsData so that no previous data is used.
+ results.subResultsData.init();
resultsList.notifyClient('get-results', { resultsType: 'sub-results',
dataIndexes: dataIndexes,
resultsList: resultsList,
diff --git a/web/app/templates/interactions/export.html.j2 b/web/app/templates/interactions/export.html.j2
index 78862c9aae297a866de73502d7131482ad450350..c61023299e9bac9daab97f3900e16645f08c8974 100644
--- a/web/app/templates/interactions/export.html.j2
+++ b/web/app/templates/interactions/export.html.j2
@@ -45,6 +45,11 @@ the selected sub results.-->
<i class="material-icons left">file_download</i>
</button>
</div>
+ <div class="col s12">
+ <div class="progress hide" id="full-results-progress-bar">
+ <div class="determinate"></div>
+ </div>
+ </div>
<div class="col s12">
<button class="waves-effect
waves-light
@@ -65,5 +70,10 @@ the selected sub results.-->
<i class="material-icons left">file_download</i>
</button>
</div>
+ <div class="col s12">
+ <div class="progress hide" id="sub-results-progress-bar">
+ <div class="determinate"></div>
+ </div>
+ </div>
</div>
</div>
\ No newline at end of file
diff --git a/web/app/templates/interactions/scroll_to_top.html.j2 b/web/app/templates/interactions/scroll_to_top.html.j2
index 69caae7e712c8902d4e88c6b950a50c698e97247..5d0ea7287be02a86146d00221164fa88ae61312f 100644
--- a/web/app/templates/interactions/scroll_to_top.html.j2
+++ b/web/app/templates/interactions/scroll_to_top.html.j2
@@ -1,5 +1,5 @@
<div id="menu-scroll-to-top-div" class="fixed-action-btn direction-top active hide" style="bottom: 45px; right: 24px;">
- <a id="menu-scroll-to-top" class="btn btn-floating btn-large cyan">
+ <a id="menu-scroll-to-top" class="btn btn-floating btn-large corpus-analysis-color.lighten">
<i class="material-icons">arrow_upward</i>
</a>
</div>
\ No newline at end of file
diff --git a/web/app/templates/query_results/inspect.html.j2 b/web/app/templates/query_results/inspect.html.j2
index 2075c1451c677af9d44ba3bb655c6aa9a46843f9..646b2865a7d57090fe6812f7ecb50b97babfc5e7 100644
--- a/web/app/templates/query_results/inspect.html.j2
+++ b/web/app/templates/query_results/inspect.html.j2
@@ -3,10 +3,9 @@
{% set headline = ' ' %}
{% set full_width = True %}
-{% set imported = True %}
{% block page_content %}
-
+{{ Macros.insert_color_scheme(corpus_analysis_color_darken) }}
<div class="col s12">
<div class="card">
<div class="card-content" style="padding-top: 5px;