From c5fa39159135e134a160b2491f85a064c9bd029e Mon Sep 17 00:00:00 2001 From: cesare Date: Fri, 6 Dec 2024 18:50:46 +0100 Subject: [PATCH] ug fixing lista risultati --- js/browseMgr.js | 47 +++++++++++++++++------------- js/utils.js | 40 ++++++++++++++++++------- js/utilsMgr.js | 2 +- node_modules/commarcdiag/README.md | 6 ++-- 4 files changed, 60 insertions(+), 35 deletions(-) diff --git a/js/browseMgr.js b/js/browseMgr.js index 510e96a..b211b20 100644 --- a/js/browseMgr.js +++ b/js/browseMgr.js @@ -26,8 +26,7 @@ $(document).ready(function() { "san Bernardo": "diaSanBernardo" } const dialogaltri = 'diaAltri' - - + var listaClausoleRisultatoContesti = [] const cantobadgeclass = 'badge badge-outline-warning badge-pill' const sparqlGenerator = sparqljs.Generator; @@ -289,7 +288,7 @@ $(document).ready(function() { //listarisultati.sort(function(a, b){return a - b}); showFrasi(start, offset) - console.log(vistaPeriodi) + if (vistaPeriodi) { loadFrasi(); } @@ -318,7 +317,9 @@ $(document).ready(function() { if (listaClausoleRisultato.length) { - var tempr = new Set() + numeroContesti = listaClausoleRisultatoContesti.length + return (listaClausoleRisultatoContesti.length) + /*var tempr = new Set() for (singleres of listaClausoleRisultato) { tempr.add(singleres.split('-')[0]) } @@ -326,7 +327,7 @@ $(document).ready(function() { tempr.forEach(y => myRis.push(listaClausoleRisultato.filter(x => (x.split('-')[0] == y) && x.split('-').length > 1))) numeroContesti = myRis.length - return (myRis.length) + return (myRis.length)*/ } numeroContesti = numeroRisultati return (numeroRisultati) @@ -354,22 +355,18 @@ $(document).ready(function() { res.sort(function(a, b) { return a - b }); return (res) } - if (listaClausoleRisultato.length) { - var tempr = new Set() - for (singleres of listaClausoleRisultato) { - tempr.add(singleres.split('-')[0]) - } - var myRis = [] + if (listaClausoleRisultatoContesti.length) { - tempr.forEach(y => myRis.push(listaClausoleRisultato.filter(x => (x.split('-')[0] == y) && x.split('-').length > 1))) - - for (risultato of myRis) { + /*for (risultato of listaClausoleRisultatoContesti) { contaContesti = contaContesti + 1; if (contaContesti >= startcont && contaContesti < endcont) { res.push(risultato) } if (contaContesti > endcont) break; + }*/ + for (i=startcont; i<=endcont; i++){ + res.push(listaClausoleRisultatoContesti[i]) } res.sort(function(a, b) { puno = a[0].split('-')[3]; pdue = b[0].split('-')[3]; return parseInt(puno) - parseInt(pdue) }); return (res) @@ -447,9 +444,9 @@ $(document).ready(function() { versiIniziali.attr('posVerso', 9999); } - var comandi = $('
') + var comandi = $('
') comandi.attr('id', "comandiFrase" + numeroRisultato) - comandi.attr('class', 'comandi col flex-nowrap d-inline justify-content-between pl-1 pb-2 ml-2 mb-2 border-bottom'); + //comandi.attr('class', 'comandi col flex-nowrap d-inline justify-content-between pl-1 pb-2 ml-2 mb-2 border-bottom'); var comandiGrp = $('
') comandiGrp.attr('class', 'btn-group flex-nowrap d-inline pr-3 mt-1 mr-3 align-text-bottom'); @@ -476,11 +473,11 @@ $(document).ready(function() { comandiGrp.appendTo(comandi); - var citazioneDiv = $('
') - citazioneDiv.attr('class', ' text-right flex-nowrap d-inline ml-3 px-3 py-0'); - var citazione = $('') + var citazioneDiv = $('
') + //citazioneDiv.attr('class', ' text-right flex-nowrap d-inline ml-3 px-3 py-0'); + var citazione = $('') citazione.append("[" + getCantica(numeroCantica) + ", Canto " + getRoman(canto) + "]") - citazione.attr('class', ' pl-3 citazioneFrase align-text-top'); + //citazione.attr('class', ' pl-3 citazioneFrase align-text-top'); citazione.attr('name', getCantica(numeroCantica) + "Canto " + canto); citazione.attr('id', idCitazione + '_' + numeroRisultato + '_' + risultato); citazione.appendTo(citazioneDiv); @@ -2083,6 +2080,16 @@ $(document).ready(function() { var valB = b.split('-')[2] return valA - valB }); + //crea la lista dei risultati per i contesti + if (listaClausoleRisultato.length) { + var tempr = new Set() + for (singleres of listaClausoleRisultato) { + tempr.add(singleres.split('-')[0]) + } + + tempr.forEach(y => listaClausoleRisultatoContesti.push(listaClausoleRisultato.filter(x => (x.split('-')[0] == y) && x.split('-').length > 1))) + } + //aggiunge badge con totale risultati accanto alle cantiche var totResultN = showBadgeInCantica(resultsInCantica) diff --git a/js/utils.js b/js/utils.js index fd0ece9..081ad17 100644 --- a/js/utils.js +++ b/js/utils.js @@ -203,9 +203,34 @@ var orlprefix = 'https://dantenetwork.it/ontology/orl/current/' var syntitprefix = 'https://dantenetwork.it/ontology/syntit/current/' -//var stringInSparql= false; - - +function getFraseContext(fraseid, numversi = 3) { + var context = [] + var listaforme = formeprima; + var mainid=fraseid.split('-')[0] + var cantica=mainid.split('_')[0] + if (cantica=='2') + listaforme = formeseconda; + if (cantica=='3') + listaforme = formeterza; + var contextinf = parseInt(fraseid.split('-')[2]) + var contextsup = parseInt(fraseid.split('-')[3]) + for (j = contextinf; j < contextsup + 1; j++) { + var tmpform = listaforme[j].split('_'); + if ((tmpform[3] > parseInt(numverso) - limitv) && (tmpform[3] < parseInt(numverso) + limitv)) { + var contextitem = {} + contextitem['testo'] = tmpform[0]; + contextitem['verso'] = tmpform[3]; + contextitem['canto'] = tmpform[1]; + contextitem['cantica'] = cantica; + contextitem['posizione'] = tmpform[2]; + contextitem['catg'] = tmpform[4]; + contextitem['periodo'] = cantica + '_' + tmpform[1] + '_s_' + tmpform[5]; + contextitem['funzperiodo'] = tmpform[6]; + context.push(contextitem); + } + } + return context; +} function getFormaContext(formaid, numversi = 3) { var context = [] @@ -253,14 +278,7 @@ function getFormaContext(formaid, numversi = 3) { } } - /*for (const [index, element] of listaforme.entries()) { - if(element.split('_')[2]==formaid){ - pos=index; - break; - } - - } - */ + var item = listaforme[pos].split('_'); var numverso = item[3] var spannum = (11 * limitv) diff --git a/js/utilsMgr.js b/js/utilsMgr.js index a4dcf4c..f4b0f48 100644 --- a/js/utilsMgr.js +++ b/js/utilsMgr.js @@ -122,7 +122,7 @@ function getFraseContext(fraseids, numversi = 3) { } maxpos = listaforme.length - 1 var pos = 0 - var startindex = Math.max(0, (offset - 40)) + var startindex = Math.max(0, (offset - 20)) for (i = startindex; i < listaforme.length; i++) { var tmpos = listaforme[i].split('_')[2] diff --git a/node_modules/commarcdiag/README.md b/node_modules/commarcdiag/README.md index 1d7bf0a..f19cfec 100644 --- a/node_modules/commarcdiag/README.md +++ b/node_modules/commarcdiag/README.md @@ -1,6 +1,6 @@ # Commedia: Arc Diagram per marcatura sintattica current -https://observablehq.com/@cesare/commarcdiag@1578 +https://observablehq.com/d/2c2aa90cdea73fae@1660 View this notebook in your browser by running a web server in this folder. For example: @@ -14,14 +14,14 @@ import this module directly into your application. To npm install: ~~~sh npm install @observablehq/runtime@5 -npm install https://api.observablehq.com/d/d019e1db56ab1d8c@1578.tgz?v=3 +npm install https://api.observablehq.com/d/2c2aa90cdea73fae@1660.tgz?v=3 ~~~ Then, import your notebook and the runtime as: ~~~js import {Runtime, Inspector} from "@observablehq/runtime"; -import define from "@cesare/commarcdiag"; +import define from "2c2aa90cdea73fae"; ~~~ To log the value of the cell named “foo”: