bug fixed
This commit is contained in:
parent
f9208aaed8
commit
4fcaa6127a
15
js/utils.js
15
js/utils.js
|
@ -191,7 +191,7 @@ var unionop = '{"union": {"type": "union", "patterns":[]}, "bgp": {"type": "bgp"
|
||||||
|
|
||||||
|
|
||||||
function parseJsonClause(op, tokens, nowhere) {
|
function parseJsonClause(op, tokens, nowhere) {
|
||||||
alert(op)
|
//alert(op)
|
||||||
if (op.trim() == 'OR') {
|
if (op.trim() == 'OR') {
|
||||||
//multipleCondSpQuery.where.push(JSON.parse(unionop)['union']);
|
//multipleCondSpQuery.where.push(JSON.parse(unionop)['union']);
|
||||||
nowhere.push(JSON.parse(unionop)['union']);
|
nowhere.push(JSON.parse(unionop)['union']);
|
||||||
|
@ -322,9 +322,16 @@ function buildSQ(stquery) {
|
||||||
|
|
||||||
}
|
}
|
||||||
//Nick
|
//Nick
|
||||||
function buildClauseNick(clause, parsedquery) {
|
function buildClauseNick(nickclause, parsedquery) {
|
||||||
clause = clause['filtro-1'];//da modificare
|
//clause = clause['filtro-1'];//da modificare
|
||||||
|
sctk = Object.keys(nickclause)
|
||||||
|
clause={}
|
||||||
|
for (ck in sctk){
|
||||||
|
if (sctk[ck].includes("filtro-")){
|
||||||
|
clause = nickclause [sctk[ck]]
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
if (clause['query'] != null && clause['query'].trim() != "") {
|
if (clause['query'] != null && clause['query'].trim() != "") {
|
||||||
if (clause['query'].trim().slice(-1) !== '*')
|
if (clause['query'].trim().slice(-1) !== '*')
|
||||||
strval = "^" + clause['query'].trim() + "$";
|
strval = "^" + clause['query'].trim() + "$";
|
||||||
|
|
Loading…
Reference in New Issue