From 71fb0c4c026d3698d40f6053c40abdb92b136be0 Mon Sep 17 00:00:00 2001 From: cesare Date: Mon, 3 Mar 2025 14:49:21 +0100 Subject: [PATCH] gestione contesti query, bug fixing --- js/browseMgr_5.1.js | 7 +++++-- js/syntgraph_5.1.js | 10 +++++----- js/utilsMgr_5.1.js | 12 ++++++++++++ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/js/browseMgr_5.1.js b/js/browseMgr_5.1.js index f10e0f7..a3d6be6 100644 --- a/js/browseMgr_5.1.js +++ b/js/browseMgr_5.1.js @@ -18,6 +18,8 @@ export var listaClausoleRisultato; export var numeroContesti; export var cantoDisplayed; export var showOffset = 30; +export var graphTextReset; + const cantobadgeclass = 'badge badge-outline-warning badge-pill' const hdnNamespace = 'http://dantenetwork.it/data/commedia/' const syntitNamespace = 'https://dantenetwork.it/ontology/syntit/current/' @@ -37,7 +39,8 @@ $(document).ready(function() { var listaClausoleRisultatoContesti = [] var listaRisultatiCommenti = [] - + graphTextReset= function(){manageResults()} + const sparqlGenerator = sparqljs.Generator; const myEngine = new Comunica.QueryEngine(); @@ -1769,7 +1772,7 @@ $(document).ready(function() { } - function manageResults() { + function manageResults() { if (listaPeriodiRisultato.length) { for (var msid of listaPeriodiRisultato) { loadPeriodo(msid) diff --git a/js/syntgraph_5.1.js b/js/syntgraph_5.1.js index 3d397f3..4262b6c 100644 --- a/js/syntgraph_5.1.js +++ b/js/syntgraph_5.1.js @@ -5,7 +5,7 @@ import commarc from "https://hdnlab1.isti.cnr.it/d3search/node_modules/commarcdiag/index.js";*/ import {Runtime, Library, Inspector} from "https://lida.dantenetwork.it/node_modules/commarcdiag/runtime.js"; import commarc from "https://lida.dantenetwork.it/node_modules/commarcdiag/index.js"; -import {formaClass, lisid, lsentid, vistaPeriodi, listaPeriodiRisultato, listaClausoleRisultato, cantoDisplayed} from "./browseMgr_5.1.js" +import {formaClass, lisid, lsentid, vistaPeriodi, listaPeriodiRisultato, listaClausoleRisultato, cantoDisplayed, graphTextReset} from "./browseMgr_5.1.js" import { fillStructCard, emptyStructCard } from "./script_5.1.js"; const iframe = document.getElementsByClassName("minimap__content"); @@ -137,14 +137,14 @@ export function resetGraphStr(){ for (let i = 0; i < sentence.length; i++) { //var matches = listaClausoleRisultato.filter(s => s.includes(sentence[i].classList[0])); sentence[i].classList.remove('font-italic'); - if (!vistaPeriodi && !listaPeriodiRisultato.includes(tmpsent) - && listaClausoleRisultato.filter(cl => cl.split('-')[0]==tmpsent).length==0) + /*if (!vistaPeriodi && !listaPeriodiRisultato.includes(tmpsent) + && listaClausoleRisultato.filter(cl => cl.split('-')[0]==tmpsent).length==0)*/ sentence[i].style.removeProperty('color'); sentence[i].classList.remove('font-weight-normal'); } - + //reset Minimap var iframeDocument = myiframe[0].contentDocument || myiframe[0].contentWindow.document; if (!iframeDocument) { @@ -160,7 +160,7 @@ export function resetGraphStr(){ } //EMPTY CARD emptyStructCard() - + graphTextReset() if (tmpsent == lsentid) { return true diff --git a/js/utilsMgr_5.1.js b/js/utilsMgr_5.1.js index 05f5ede..757dad6 100644 --- a/js/utilsMgr_5.1.js +++ b/js/utilsMgr_5.1.js @@ -592,6 +592,18 @@ function buildSQ(stquery) { } console.log(tmpJ); buildSPQuery(tmpJ); + if (filtroContesto.length > 0) { + for (tmpc of filtroContesto) { + console.log(filtroContesto[0]) + multipleCondSpQuery.where.splice(1, 0, tmpc) + } + + /*if (stquery[clause]['queryText'].trim() == "") { + if (myquery.where[0].type == 'filter') + myquery.where.splice(0, 1) + }*/ + + } return multipleCondSpQuery; }