queries periodi, in progress
This commit is contained in:
parent
6f8b35d1f1
commit
1b86cb12d6
|
@ -309,6 +309,7 @@ function buildSPQuery(guiquery) {
|
||||||
if (theguiQ['unitaRicerca']=='periodo') {
|
if (theguiQ['unitaRicerca']=='periodo') {
|
||||||
multipleCondSpQuery.where.push(bindConcatStatement)
|
multipleCondSpQuery.where.push(bindConcatStatement)
|
||||||
multipleCondSpQuery.where.push(occBindConcatStatement)
|
multipleCondSpQuery.where.push(occBindConcatStatement)
|
||||||
|
|
||||||
if (posBindConcatStatement['expression']['args'].length){
|
if (posBindConcatStatement['expression']['args'].length){
|
||||||
multipleCondSpQuery.where.push(posBindConcatStatement)
|
multipleCondSpQuery.where.push(posBindConcatStatement)
|
||||||
multipleCondSpQuery.variables.push(JSON.parse(sentencetarget_posVariable))
|
multipleCondSpQuery.variables.push(JSON.parse(sentencetarget_posVariable))
|
||||||
|
@ -473,13 +474,22 @@ function buildStatementClause(clause, parsedquery, whereind, theplace, token) {
|
||||||
|
|
||||||
|
|
||||||
if (clause['queryText'] != null && clause['queryText'].trim() != "") {
|
if (clause['queryText'] != null && clause['queryText'].trim() != "") {
|
||||||
//theplace.push(JSON.parse(unionop)['group']);
|
|
||||||
|
|
||||||
var stmt = buildFilterStatement(clause['lemma_forma'], clause['queryText'].trim(), clause['opzioni_testo'])
|
var stmt = buildFilterStatement(clause['lemma_forma'], clause['queryText'].trim(), clause['opzioni_testo'])
|
||||||
tmpgroup.patterns.push(stmt)
|
tmpgroup.patterns.push(stmt)
|
||||||
tmpgroup.patterns.push(JSON.parse(unionop)['bgp']);
|
tmpgroup.patterns.push(JSON.parse(unionop)['bgp']);
|
||||||
|
if(clause['lemma_forma']=='lemma'){
|
||||||
|
tmpgroup.patterns.at(-1).triples.push(JSON.parse(lemma_lexicalform))
|
||||||
|
tmpgroup.patterns.at(-1).triples.push(JSON.parse(lemma_canonicalform))
|
||||||
|
tmpgroup.patterns.at(-1).triples.push(JSON.parse(lemma_writtenrepresentation))
|
||||||
|
}
|
||||||
|
else{
|
||||||
tmpgroup.patterns.at(-1).triples.push(JSON.parse(writtenrepresentation))
|
tmpgroup.patterns.at(-1).triples.push(JSON.parse(writtenrepresentation))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
if (clause['typeGramm0'] != null && clause['typeGramm0'] != "all")
|
if (clause['typeGramm0'] != null && clause['typeGramm0'] != "all")
|
||||||
if (whereind > -1)
|
if (whereind > -1)
|
||||||
parsedquery.where[whereind].triples.push(JSON.parse(data21)[clause['typeGramm0']]);
|
parsedquery.where[whereind].triples.push(JSON.parse(data21)[clause['typeGramm0']]);
|
||||||
|
|
Loading…
Reference in New Issue