diff --git a/app/static/js/nopaque.lists.js b/app/static/js/nopaque.lists.js index 86ead2ed..955e3e31 100644 --- a/app/static/js/nopaque.lists.js +++ b/app/static/js/nopaque.lists.js @@ -93,11 +93,9 @@ RessourceList.options = { class ResultList extends List { createResultRowElement(item, chunk) { - let values, cpos, token, matchRowElement, lcCellElement, hitCellElement, rcCellElement, textTitlesCellElement; + let values, cpos, token, matchRowElement, lcCellElement, hitCellElement, rcCellElement, textTitlesCellElement, matchNrElement; // gather values from item values = item.values(); - console.log("CHONK"); - console.log(chunk); // get infos for full match row matchRowElement = document.createElement("tr"); @@ -116,6 +114,8 @@ class ResultList extends List { hitCellElement.classList.add("match-hit"); textTitlesCellElement = document.createElement("td"); textTitlesCellElement.classList.add("titles"); + matchNrElement = document.createElement("td"); + matchNrElement.classList.add("match-nr"); matchRowElement.appendChild(hitCellElement); for (cpos of values["hit"]) { token = chunk["cpos_lookup"][cpos]; @@ -132,6 +132,8 @@ class ResultList extends List { hitCellElement.appendChild(inspectBtn); textTitlesCellElement.innerText = [...textTitles].join(", "); matchRowElement.insertAdjacentHTML("afterbegin", textTitlesCellElement.outerHTML); + matchNrElement.innerText = values["index"] + 1; + matchRowElement.insertAdjacentHTML("afterbegin", matchNrElement.outerHTML); // get infos for right context of match rcCellElement = document.createElement("td"); @@ -141,7 +143,6 @@ class ResultList extends List { token = chunk["cpos_lookup"][cpos]; rcCellElement.insertAdjacentHTML("beforeend", `${token["word"]} `); } - console.log(matchRowElement); return matchRowElement } } diff --git a/app/templates/corpora/analyse_corpus.html.j2 b/app/templates/corpora/analyse_corpus.html.j2 index 1357bc9c..0485e72a 100644 --- a/app/templates/corpora/analyse_corpus.html.j2 +++ b/app/templates/corpora/analyse_corpus.html.j2 @@ -163,7 +163,8 @@
Title | +Nr. | +Title | Left context | Match | Right Context | @@ -313,6 +314,7 @@ valueNames: ["titles", "lc", "hit", "rc", {data: ["index"]}], item: ``}; resultList = new ResultList('result-list', options); + resultList.clear(); // empty list for new query }); @@ -336,6 +338,7 @@ return; // no further code execution of this code block } // logs the current recieved chunk + chunk = {}; chunk = response["result"]; console.log("### corpus_analysis chunk ###"); console.log(chunk); @@ -363,7 +366,6 @@ // List building/appending the chunks when query had results // write metadata query information into HTML elements // like nr. of all matches in how many files etc. - // TODO: count_corpus_files müssen aus full results genommen werden. Ist am Ende richtig aber dazwischen zählt es hoch match_count = chunk["match_count"]; let count_corpus_files = Object.keys(result["text_lookup"]).length; queryResultsMetadataElement.innerHTML = chunk["match_count"] + " matches in " + count_corpus_files + " corpus files."; @@ -406,7 +408,7 @@ var currentTime = today.getUTCHours() + ":" + today.getUTCMinutes() + ":" + today.getUTCSeconds(); var safeFilename = message['query'].replace(/[^a-z0-9_-]/gi, "_"); var resultFilename = "UTC-" + currentDate + "_" + currentTime + "_" + safeFilename + ".json"; - // get a where download is served + // get where download is served var downloadResults = document.getElementById("download-results"); // stringify JSON object for json download var dataStr = JSON.stringify(message, undefined, 2);
---|