modificata query cond sintattiche

This commit is contained in:
cesare 2023-04-21 12:39:37 +02:00
parent fabd67bd0d
commit 138e890324
1 changed files with 12 additions and 7 deletions

View File

@ -423,17 +423,22 @@ function parseJsonClause(op, tokens, nowhere) {
//alert(op) //alert(op)
var idp = -1 var idp = -1
if (nowhere[0].type == 'filter' && nowhere[0].expression.args[0].value == 'Rappresentazione') { if (nowhere[0].type == 'filter' && nowhere[0].expression.args[0].value == 'Rappresentazione') {
nowhere.splice(0, 1) //nowhere.splice(0, 1)
nowhere.splice(0, 2)
} }
if (op.trim() == 'OR') { if (op.trim() == 'OR') {
//nowhere.unshift(JSON.parse(unionop)['union']);
nowhere.splice(1, 0, JSON.parse(unionop)['union']) //nowhere.splice(1, 0, JSON.parse(unionop)['union'])
idp = 1 nowhere.splice(0, 0, JSON.parse(unionop)['union'])
//idp = 1
idp = 0
} }
if (op.trim() == 'AND') { if (op.trim() == 'AND') {
//nowhere.push(JSON.parse(unionop)['group']);
nowhere.splice(1, 0, JSON.parse(unionop)['group']) //nowhere.splice(1, 0, JSON.parse(unionop)['group'])
idp = 1 nowhere.splice(0, 0, JSON.parse(unionop)['group'])
//idp = 1
idp = 0
} }
for (var mtoken in tokens) { for (var mtoken in tokens) {