modifica query

js/browseMgr_5.1.js

@@ -39,7 +39,7 @@ $(document).ready(function() {
 	var listaClausoleRisultatoContesti = []
 
 	var listaRisultatiCommenti = []
-	graphTextReset= function(){manageResults()}
+	graphTextReset = function() { manageResults() }
 
 	const sparqlGenerator = sparqljs.Generator;
 	const myEngine = new Comunica.QueryEngine();
@@ -508,11 +508,11 @@ $(document).ready(function() {
 			$(idris).addClass("font-weight-bold mark ")
 		}
 
-		if(listarisultati.length==0){
+		if (listarisultati.length == 0) {
-			for (var ric of resincontext){
+			for (var ric of resincontext) {
-				if (Array.isArray(ric)){
+				if (Array.isArray(ric)) {
-					for (var ricel of ric){
+					for (var ricel of ric) {
-						var telric=ricel.split('-')[0]+' '+ricel.split('-')[1]+' '+ricel.split('-')[2]+' '+ricel.split('-')[3]
+						var telric = ricel.split('-')[0] + ' ' + ricel.split('-')[1] + ' ' + ricel.split('-')[2] + ' ' + ricel.split('-')[3]
 						clausesinrs.push(telric)
 					}
 				}
@@ -741,40 +741,44 @@ $(document).ready(function() {
 		if (!isPeriodoInCanto(idperiodo, cantoDisplayed) && !(cantoDisplayed.includes('#vistaFrasi')))
 			return
 
-		/*$(cantoDisplayed).find(' .' + idperiodo + '.' + funzionefrase).each(function() {
+
-			var tpstp = $(this).attr('class').split(" ")[1]
+		if (fromn == null || ton == null) {
-			$(this).css('color', colorssp(mapsynttypestopalette[tpstp]));
+			$(cantoDisplayed).find(' .' + idperiodo + '.' + funzionefrase).each(function() {
+				var tpstp = $(this).attr('class').split(" ")[1]
+				$(this).css('color', colorssp(mapsynttypestopalette[tpstp]));
 
 
-		})
+			})
 
-		minim.contents().find(' .' + idperiodo + '.' + funzionefrase).each(function() {
+			minim.contents().find(' .' + idperiodo + '.' + funzionefrase).each(function() {
-			var mtpstp = $(this).attr('class').split(" ")[1]
+				var mtpstp = $(this).attr('class').split(" ")[1]
-			$(this).css('color', colorssp(mapsynttypestopalette[mtpstp]));
+				$(this).css('color', colorssp(mapsynttypestopalette[mtpstp]));
-		})*/
+			})
+		}
+		else {
+			$(cantoDisplayed).find(' .' + idperiodo).each(function() {
+				var vid = parseInt($(this).attr('id').replace('e', ''))
+				if (vid >= parseInt(fromn)
+					&& vid <= parseInt(ton)) {
+					var pstp = $(this).attr('class').split(" ")[1]
 
-		$(cantoDisplayed).find(' .' + idperiodo).each(function() {
+					if (pstp.trim() == funzionefrase)
-			var vid = parseInt($(this).attr('id').replace('e', ''))
+						$(this).css('color', colorssp(mapsynttypestopalette[pstp]));
-			if (vid >= parseInt(fromn)
+				}
-				&& vid <= parseInt(ton)) {
-				var pstp = $(this).attr('class').split(" ")[1]
 
-				if (pstp.trim() == funzionefrase)
+			})
-					$(this).css('color', colorssp(mapsynttypestopalette[pstp]));
-			}
 
-		})
+			minim.contents().find(' .' + idperiodo).each(function() {
+				var vid = parseInt($(this).attr('id').replace('e', ''))
+				if (vid >= parseInt(fromn)
+					&& vid <= parseInt(ton)) {
+					var mpstp = $(this).attr('class').split(" ")[1]
+					if (mpstp.trim() == funzionefrase)
+						$(this).css('color', colorssp(mapsynttypestopalette[mpstp]));
+				}
 
-		minim.contents().find(' .' + idperiodo).each(function() {
+			})
-			var vid = parseInt($(this).attr('id').replace('e', ''))
+		}
-			if (vid >= parseInt(fromn)
-				&& vid <= parseInt(ton)) {
-				var mpstp = $(this).attr('class').split(" ")[1]
-				if (mpstp.trim() == funzionefrase)
-					$(this).css('color', colorssp(mapsynttypestopalette[mpstp]));
-			}
-
-		})
 	}
 
 
@@ -1065,7 +1069,7 @@ $(document).ready(function() {
 		return noteGroupCard;
 	}
 
-	var toTitleCase = str => str.replace(/(^\w|\s\w)(\S*)/g, (_,m1,m2) => m1.toUpperCase()+m2.toLowerCase())
+	var toTitleCase = str => str.replace(/(^\w|\s\w)(\S*)/g, (_, m1, m2) => m1.toUpperCase() + m2.toLowerCase())
 
 	function createNoteEntry(comments, id, pos) {
 		const tmplistaidcomm = getListaIdCommenti()
@@ -1775,7 +1779,7 @@ $(document).ready(function() {
 
 	}
 
-	 function manageResults() {
+	function manageResults() {
 		if (listaPeriodiRisultato.length) {
 			for (var msid of listaPeriodiRisultato) {
 				loadPeriodo(msid)

js/sparqltemplates.js

@@ -486,7 +486,7 @@ const sentencetarget_morphgroup = `{"type": "group",
 				                     "predicate": {"termType": "NamedNode","value": "https://dantenetwork.it/ontology/olires/current/occurrenceOf"},
 				                     "object": {"termType": "Variable","value": "clg"}},
 				                     {"subject": {"termType": "Variable","value": "cloccte"},
-				                     "predicate": {"termType": "NamedNode","value": "http://erlangen-crm.org/current/P148_has_component"},
+				                     "predicate": {"termType": "NamedNode","value": "https://erlangen-crm.org/current/P148_has_component"},
 				                     "object": {"termType": "Variable","value": "fa"}}
 				                    ]
 				            }
@@ -504,7 +504,7 @@ const sentencetarget_morphgroup_short = `{"type": "group",
 				                     "predicate": {"termType": "NamedNode","value": "https://dantenetwork.it/ontology/olires/current/OccursInRegion"},
 				                     "object": {"termType": "Variable", "value": "reg"}},
 									 {"subject": {"termType": "Variable","value": "cloccte"},
-									  "predicate": {"termType": "NamedNode","value": "http://erlangen-crm.org/current/P148_has_component"},
+									  "predicate": {"termType": "NamedNode","value": "https://erlangen-crm.org/current/P148_has_component"},
 									  "object": {"termType": "Variable","value": "fa"}},
 				                     {"subject": {"termType": "Variable","value": "cloccte"},
 				                     "predicate": {"termType": "NamedNode","value": "https://dantenetwork.it/ontology/olires/current/occurrenceOf"},
@@ -541,7 +541,7 @@ const occurrenceof_form = `{"subject": {"termType": "Variable","value": "fa"},
 				                     "predicate": {"termType": "NamedNode","value": "https://dantenetwork.it/ontology/olires/current/occurrenceOf"},
 				                     "object": {"termType": "Variable","value": "form"}}`
 const clauseocc_hascomponent_formocc = `{"subject": {"termType": "Variable","value": "cloccu"},
-				                     "predicate": {"termType": "NamedNode","value": "http://erlangen-crm.org/current/P148_has_component"},
+				                     "predicate": {"termType": "NamedNode","value": "https://erlangen-crm.org/current/P148_has_component"},
 				                     "object": {"termType": "Variable","value": "fa"}}`
 
 const occurrenceof_clause = `{"subject": {"termType": "Variable","value": "cloccu"},

js/syntgraph_5.1.js

@@ -139,6 +139,7 @@ export function resetGraphStr(){
 			sentence[i].classList.remove('font-italic');
 			/*if (!vistaPeriodi && !listaPeriodiRisultato.includes(tmpsent)
 				&& listaClausoleRisultato.filter(cl => cl.split('-')[0]==tmpsent).length==0)*/
+			if (!vistaPeriodi)
 				sentence[i].style.removeProperty('color');
 
 			sentence[i].classList.remove('font-weight-normal');