ottimizzato codice
This commit is contained in:
parent
698bb099d9
commit
3fe867261d
|
@ -1408,7 +1408,7 @@ function resetFrasi(){
|
||||||
alert('Digitare una stringa da cercare')
|
alert('Digitare una stringa da cercare')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (jsonQuery['Clausola0']['lemma_forma'] == 'testo') {
|
if (jsonQuery['Clausola0']['lemma_forma'] == 'testo' && jsonQuery['Clausola0']['Attiva'] == 1) {
|
||||||
searchwords = jsonQuery['Clausola0']['queryText'].trim().split(' ')
|
searchwords = jsonQuery['Clausola0']['queryText'].trim().split(' ')
|
||||||
var contesto = JSON.parse(jsonQuery['Clausola0']['contesto'])
|
var contesto = JSON.parse(jsonQuery['Clausola0']['contesto'])
|
||||||
var inf = []
|
var inf = []
|
||||||
|
@ -1470,6 +1470,10 @@ function resetFrasi(){
|
||||||
|
|
||||||
for (var ip=0; ip<=limit; ip++){
|
for (var ip=0; ip<=limit; ip++){
|
||||||
var fnd=true
|
var fnd=true
|
||||||
|
if(cont.length && !cont.includes(parseInt(forme[ip].split('_')[1]))){
|
||||||
|
fnd=false;
|
||||||
|
break
|
||||||
|
}
|
||||||
for (var frind=0; frind<testo.length; frind++){
|
for (var frind=0; frind<testo.length; frind++){
|
||||||
if (testo[frind].toLowerCase()!=forme[ip+frind].split('_')[0].toLowerCase()){
|
if (testo[frind].toLowerCase()!=forme[ip+frind].split('_')[0].toLowerCase()){
|
||||||
fnd=false;
|
fnd=false;
|
||||||
|
@ -1478,10 +1482,7 @@ function resetFrasi(){
|
||||||
}
|
}
|
||||||
if (fnd){
|
if (fnd){
|
||||||
//console.log('ipfound: '+forme[ip].split('_')[2]+' - '+forme[(ip+testo.length-1)].split('_')[2])
|
//console.log('ipfound: '+forme[ip].split('_')[2]+' - '+forme[(ip+testo.length-1)].split('_')[2])
|
||||||
if(cont.length && !cont.includes(parseInt(forme[ip].split('_')[1]))){
|
|
||||||
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
resultsInCantica.push(cantica)
|
resultsInCantica.push(cantica)
|
||||||
resultsInCanto.push(cantica+'Canto '+forme[ip].split('_')[1])
|
resultsInCanto.push(cantica+'Canto '+forme[ip].split('_')[1])
|
||||||
var tstar= parseInt(forme[ip].split('_')[2])
|
var tstar= parseInt(forme[ip].split('_')[2])
|
||||||
|
|
|
@ -459,7 +459,7 @@ function buildSQ(stquery) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stquery['Clausola0']['queryText'] != "") {
|
if (stquery['Clausola0']['queryText'] != "" && stquery['Clausola0']['Attiva'] == 1) {
|
||||||
searchtext = stquery['Clausola0']['queryText']
|
searchtext = stquery['Clausola0']['queryText']
|
||||||
let strval = searchtext
|
let strval = searchtext
|
||||||
if (stquery['Clausola0']['lemma_forma'] == 'testo'){
|
if (stquery['Clausola0']['lemma_forma'] == 'testo'){
|
||||||
|
|
Loading…
Reference in New Issue