From 3fe867261dfdba1c2ce7d4f6dd92c3981d6b6347 Mon Sep 17 00:00:00 2001
From: cesare <cesare@bigeh>
Date: Mon, 12 Feb 2024 15:33:37 +0100
Subject: [PATCH] ottimizzato codice

---
 js/cesareBrowse.js | 9 +++++----
 js/utils.js        | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/cesareBrowse.js b/js/cesareBrowse.js
index 1ca5284..a2bf380 100644
--- a/js/cesareBrowse.js
+++ b/js/cesareBrowse.js
@@ -1408,7 +1408,7 @@ function resetFrasi(){
 			alert('Digitare una stringa da cercare')
 			return
 		}
-		if (jsonQuery['Clausola0']['lemma_forma'] == 'testo') {
+		if (jsonQuery['Clausola0']['lemma_forma'] == 'testo' && jsonQuery['Clausola0']['Attiva'] == 1) {
 			searchwords = jsonQuery['Clausola0']['queryText'].trim().split(' ')
 			var contesto = JSON.parse(jsonQuery['Clausola0']['contesto'])
 			var inf = []
@@ -1470,6 +1470,10 @@ function resetFrasi(){
 		
 		for (var ip=0; ip<=limit; ip++){
 				var fnd=true
+				if(cont.length && !cont.includes(parseInt(forme[ip].split('_')[1]))){
+					fnd=false;
+					break
+				}
 				for (var frind=0; frind<testo.length; frind++){
 					if (testo[frind].toLowerCase()!=forme[ip+frind].split('_')[0].toLowerCase()){
 						fnd=false;
@@ -1478,10 +1482,7 @@ function resetFrasi(){
 				}
 				if (fnd){
 					//console.log('ipfound: '+forme[ip].split('_')[2]+' - '+forme[(ip+testo.length-1)].split('_')[2])
-					if(cont.length && !cont.includes(parseInt(forme[ip].split('_')[1]))){
 					
-						continue
-					}
 					resultsInCantica.push(cantica)
 					resultsInCanto.push(cantica+'Canto '+forme[ip].split('_')[1])
 					var tstar= parseInt(forme[ip].split('_')[2])
diff --git a/js/utils.js b/js/utils.js
index 879e229..9700b28 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -459,7 +459,7 @@ function buildSQ(stquery) {
 			
 		}
 	
-	if (stquery['Clausola0']['queryText'] != "") {
+	if (stquery['Clausola0']['queryText'] != "" && stquery['Clausola0']['Attiva'] == 1) {
 		searchtext = stquery['Clausola0']['queryText']
 		let strval = searchtext
 		if (stquery['Clausola0']['lemma_forma'] == 'testo'){