filtro posizione in clausola

This commit is contained in:
cesare 2025-03-12 10:24:24 +01:00
parent a1e947aed8
commit f99bddad4d
1 changed files with 10 additions and 32 deletions

View File

@ -855,6 +855,7 @@ function buildStatementClause(clause, parsedquery, whereind, theplace, token, op
tmpg = tmpg.replaceAll('"cf"', '"cf' + token + '"') tmpg = tmpg.replaceAll('"cf"', '"cf' + token + '"')
tmpg = tmpg.replaceAll('"fa"', '"fa' + token + '"') tmpg = tmpg.replaceAll('"fa"', '"fa' + token + '"')
tmpg = tmpg.replaceAll('"pos"', '"pos' + token + '"') tmpg = tmpg.replaceAll('"pos"', '"pos' + token + '"')
tmpg = tmpg.replaceAll('"seqpos"', '"seqpos' + token + '"')
tmpg = tmpg.replaceAll('"lm"', '"lm' + token + '"') tmpg = tmpg.replaceAll('"lm"', '"lm' + token + '"')
tmpg = tmpg.replaceAll('"reg"', '"reg' + token + '"') tmpg = tmpg.replaceAll('"reg"', '"reg' + token + '"')
tmpg = tmpg.replaceAll('"verso"', '"verso' + token + '"') tmpg = tmpg.replaceAll('"verso"', '"verso' + token + '"')
@ -916,45 +917,22 @@ function buildStatementClause(clause, parsedquery, whereind, theplace, token, op
} }
else { else {
parsedquery['variables'].push(JSON.parse(tmppos)) parsedquery['variables'].push(JSON.parse(tmppos))
var andfilter = clausepos_gr_filter.replaceAll("pos_", "pos" + token) var posfilter = formapos_frase_filter.replaceAll("seqpos_", "seqpos" + token)
//TEST //Posizione nella clausola
/*if (document.querySelector('#Posizione_fr') != null &&
document.querySelector('#Posizione_fr').value.trim() != '') */
if (clause['Posizioni']!=null && clause['Posizioni']!='1,37'){ if (clause['Posizioni']!=null && clause['Posizioni']!='1,37'){
var pospar= clause['Posizioni'].split(',') var pospar= clause['Posizioni'].split(',')
if (pospar[0]==pospar[1]){ if (pospar[0]==pospar[1]){
andfilter = andfilter.replace('<=', '=') posfilter = posfilter.replace('<=', '=')
andfilter = andfilter.replace('clfr', 'clfr+' + (parseInt(pospar[1])-1)) posfilter = posfilter.replace('_0_', (parseInt(pospar[1])))
posfilter = posfilter.replace('_999_', (parseInt(pospar[1]))+100 )
} }
else{ else{
andfilter = andfilter.replace('clfr', 'clfr+' + (parseInt(pospar[0]))) posfilter = posfilter.replace('_0_', (parseInt(pospar[0])))
andfilter = andfilter.replace('clto', 'clfr+' + (parseInt(pospar[1]))) posfilter = posfilter.replace('_999_', (parseInt(pospar[1])))
} }
/*var posrestr = document.querySelector('#Posizione_fr').value parsedquery['where'].push(JSON.parse(posfilter))
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(andfilter))
} }