From f99bddad4df69a435e5572dac9d908922fa0fb93 Mon Sep 17 00:00:00 2001
From: cesare <cesare@bigeh>
Date: Wed, 12 Mar 2025 10:24:24 +0100
Subject: [PATCH] filtro posizione in clausola

---
 js/utilsMgr_5.1.js | 42 ++++++++++--------------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/js/utilsMgr_5.1.js b/js/utilsMgr_5.1.js
index 3c35047..e4037b7 100644
--- a/js/utilsMgr_5.1.js
+++ b/js/utilsMgr_5.1.js
@@ -855,6 +855,7 @@ function buildStatementClause(clause, parsedquery, whereind, theplace, token, op
 			tmpg = tmpg.replaceAll('"cf"', '"cf' + token + '"')
 			tmpg = tmpg.replaceAll('"fa"', '"fa' + token + '"')
 			tmpg = tmpg.replaceAll('"pos"', '"pos' + token + '"')
+			tmpg = tmpg.replaceAll('"seqpos"', '"seqpos' + token + '"')
 			tmpg = tmpg.replaceAll('"lm"', '"lm' + token + '"')
 			tmpg = tmpg.replaceAll('"reg"', '"reg' + token + '"')
 			tmpg = tmpg.replaceAll('"verso"', '"verso' + token + '"')
@@ -916,45 +917,22 @@ function buildStatementClause(clause, parsedquery, whereind, theplace, token, op
 				}
 				else {
 					parsedquery['variables'].push(JSON.parse(tmppos))
-					var andfilter = clausepos_gr_filter.replaceAll("pos_", "pos" + token)
-					//TEST
-					/*if (document.querySelector('#Posizione_fr') != null &&
-						document.querySelector('#Posizione_fr').value.trim() != '') */
+					var posfilter = formapos_frase_filter.replaceAll("seqpos_", "seqpos" + token)
+					//Posizione nella clausola
 					if (clause['Posizioni']!=null && clause['Posizioni']!='1,37'){
 						var pospar= clause['Posizioni'].split(',')
 						if (pospar[0]==pospar[1]){
-							andfilter = andfilter.replace('<=', '=')
-							andfilter = andfilter.replace('clfr', 'clfr+' + (parseInt(pospar[1])-1))
+							posfilter = posfilter.replace('<=', '=')
+							posfilter = posfilter.replace('_0_', (parseInt(pospar[1])))
+							posfilter = posfilter.replace('_999_', (parseInt(pospar[1]))+100 )
 						}
 						else{
-							andfilter = andfilter.replace('clfr', 'clfr+' + (parseInt(pospar[0])))
-							andfilter = andfilter.replace('clto', 'clfr+' + (parseInt(pospar[1])))
+							posfilter = posfilter.replace('_0_',  (parseInt(pospar[0])))
+							posfilter = posfilter.replace('_999_', (parseInt(pospar[1])))
 						}
-						/*var posrestr = document.querySelector('#Posizione_fr').value
-						var pospar = []
-						try {
-							pospar = parserFiltroPosizione.parse(posrestr.trim())
-							if (pospar[1] != null) {
-								andfilter = andfilter.replace('<=', '=')
-								andfilter = andfilter.replace('clfr', 'clfr+' + (parseInt(pospar[1]) - 1))
-							}
-							else {
-								var inter = pospar[0]
-								if (inter[0] != null) {
-									andfilter = andfilter.replace('clfr', 'clfr+' + (parseInt(inter[0])))
-								}
-								if (inter[1] != null) {
-									andfilter = andfilter.replace('clto', 'clfr+' + (parseInt(inter[1])))
-
-								}
-							}
-						}
-						catch (err) {
-							console.log(err)
-						}
-*/
+						parsedquery['where'].push(JSON.parse(posfilter))
 					}
-					parsedquery['where'].push(JSON.parse(andfilter))
+					
 					
 				}