implementazione query sintattiche
This commit is contained in:
parent
0ce3e1bd62
commit
29e9c509de
25
js/utils.js
25
js/utils.js
|
@ -567,8 +567,9 @@ function buildStatementClause(clause, parsedquery, whereind, theplace) {
|
||||||
var functS = clause['functionSyntax'];
|
var functS = clause['functionSyntax'];
|
||||||
var typeS = clause['typeSyntax0']
|
var typeS = clause['typeSyntax0']
|
||||||
console.log(functS + ' ' + typeS)
|
console.log(functS + ' ' + typeS)
|
||||||
|
var myf =''
|
||||||
if (functS != null && functS != ".+") {
|
if (functS != null && functS != ".+") {
|
||||||
var myf = buildsyntClause(funzione_clausola[functS])
|
myf = buildsyntClause(funzione_clausola[functS])
|
||||||
if (myf != '')
|
if (myf != '')
|
||||||
tmpgroup.patterns.at(-1).triples.push(myf)
|
tmpgroup.patterns.at(-1).triples.push(myf)
|
||||||
}
|
}
|
||||||
|
@ -582,12 +583,16 @@ function buildStatementClause(clause, parsedquery, whereind, theplace) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
myf = buildsyntClause(macrotipi_sint[typeS])
|
var tmptr=macrotipi_sint[typeS].split(';')
|
||||||
|
for (indttr in tmptr){
|
||||||
|
myf = buildsyntClause(tmptr[indttr])
|
||||||
if (myf != '')
|
if (myf != '')
|
||||||
tmpgroup.patterns.at(-1).triples.push(myf)
|
tmpgroup.patterns.at(-1).triples.push(myf)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
theplace.push(tmpgroup)
|
theplace.push(tmpgroup)
|
||||||
|
@ -640,10 +645,16 @@ function buildSintacticClause(clause, parsedquery, whereind) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
myf = buildsyntClause(alltipi[typeS])
|
//myf = buildsyntClause(alltipi[typeS])
|
||||||
|
//if (myf != '')
|
||||||
|
// parsedquery.where.at(-1).triples.push(myf)
|
||||||
|
var tmptr=macrotipi_sint[typeS].split(';')
|
||||||
|
for (indttr in tmptr){
|
||||||
|
myf = buildsyntClause(tmptr[indttr])
|
||||||
if (myf != '')
|
if (myf != '')
|
||||||
parsedquery.where.at(-1).triples.push(myf)
|
parsedquery.where.at(-1).triples.push(myf)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//myf = buildsyntClause(alltipi[typeS])
|
//myf = buildsyntClause(alltipi[typeS])
|
||||||
//parsedquery.where.at(-1).triples.push(myf);
|
//parsedquery.where.at(-1).triples.push(myf);
|
||||||
|
@ -1685,11 +1696,13 @@ var macrotipi_sint =
|
||||||
"macro obliqua": "hasClauseType:Obliqua",
|
"macro obliqua": "hasClauseType:Obliqua",
|
||||||
"macro oggettiva": "hasClauseType:Oggettiva",
|
"macro oggettiva": "hasClauseType:Oggettiva",
|
||||||
"macro otta": "hasClauseType:Ottativa",
|
"macro otta": "hasClauseType:Ottativa",
|
||||||
"macro pare mod": "hasClauseType:ParenteticaModalizzante",
|
//"macro pare mod": "hasClauseType:ParenteticaModalizzante",
|
||||||
//"macro pare sub": "hasClauseType:ParenteticaConValoreDiSubordinata",
|
//"macro pare sub": "hasClauseType:ParenteticaConValoreDiSubordinata",
|
||||||
"macro pare sub": "hasClauseType:Parentetica",
|
"macro pare mod": "hasClauseType:Modalizzante;hasClauseFunction:ParentethicalClause",
|
||||||
|
"macro pare sub": "hasClauseType:Subordinata;hasClauseFunction:ParentethicalClause",
|
||||||
"macro pred": "hasClauseType:Predicativa",
|
"macro pred": "hasClauseType:Predicativa",
|
||||||
"macro pseudo": "hasClauseType:Pseudocoordinata",
|
//"macro pseudo": "hasClauseType:Pseudocoordinata",
|
||||||
|
"macro pseudo": "hasClauseFunction:ParentheticalCoordinateClause",
|
||||||
"macro rel": "hasClauseType:Relativa",
|
"macro rel": "hasClauseType:Relativa",
|
||||||
"macro sog": "hasClauseType:Soggettiva",
|
"macro sog": "hasClauseType:Soggettiva",
|
||||||
"macro strum": "hasClauseType:Strumentale",
|
"macro strum": "hasClauseType:Strumentale",
|
||||||
|
|
Loading…
Reference in New Issue