concordia
/
LiDa_Search
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed some bugs

This commit is contained in:
nicola 2024-11-29 18:23:27 +01:00
parent fc7152b676
commit c0f552b951
1 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
js/browseMgr.js
View File

@ -1448,22 +1448,52 @@ $(document).ready(function() {
cleanSearchResult() cleanSearchResult()
esprlogica = [] esprlogica = []
jsonQuery = getJsonQuery() jsonQuery = getJsonQuery()
var clausola; var clausola = jsonQuery['Clausola1'];
var fakeAdvancedSearch = false; var qterm;
if (jsonQuery['QueryAvanzata'] == 0){ // ricerca semplice var query;
var lemma_forma;
var opzioni;
if (clausola != null){
jsonQuery['QueryAvanzata'] = "1";
}
if (jsonQuery['QueryAvanzata'] == 0){ // Nik ricerca semplice sistema ricerca semplice dopo aver attivato Avanzata
unitaRicerca = 'forma' unitaRicerca = 'forma'
jsonQuery['Clausola0']['queryText'] = $("#queryText")[0].value; // work around to fix simple query qterm = $("#queryText")[0].value;
if (qterm == ""){
qterm = $("#queryTextUnita")[0].value; // Nik ricerca semplice al posto di avanzata
}
jsonQuery['Clausola0']['queryText'] = qterm; // work around to fix simple query
jsonQuery['Clausola0']['Attiva'] = "1"; jsonQuery['Clausola0']['Attiva'] = "1";
} }
else{ else{
clausola = jsonQuery['Clausola1']; //clausola = jsonQuery['Clausola1'];
if (clausola == null){ if (clausola == null){
unitaRicerca = 'forma' unitaRicerca = $('#unitaRicerca').val();//'forma' opzioni_testoUnita
jsonQuery['Clausola0']['queryText'] = $("#queryTextUnita")[0].value; // work around to fix simple query $('#cleanresult2').trigger('click');
//jsonQuery['Clausola0']['queryText'] = $("#queryTextUnita")[0].value; // NIK work around to fix simple query
jsonQuery['Clausola0']['Attiva'] = "1"; jsonQuery['Clausola0']['Attiva'] = "1";
jsonQuery['unitaRicerca'] = "forma"; jsonQuery['unitaRicerca'] = unitaRicerca;// "forma";
jsonQuery['QueryAvanzata'] = 0; switch (unitaRicerca) {
fakeAdvancedSearch = true; case "forma":
case "lemma":
query = $('#queryTextUnita').val();
lemma_forma = $('#unitaRicerca').val();
opzioni = $('#opzioni_testoUnita').val();
break;
case "frase":
case "periodo":
case "discorso":
case "riferimenti":
opzioni = $('#opzioni_testoINIT').val();
lemma_forma = $('#lemma_formaINIT').val();
query = $('#queryTextINIT').val();
break;
}
jsonQuery['Clausola0']['lemma_forma'] = lemma_forma;
//jsonQuery['QueryAvanzata'] = "0";
jsonQuery['Clausola0']['queryText'] = query;
jsonQuery['Clausola0']['opzioni_testo'] = opzioni;
}else{ }else{
unitaRicerca = jsonQuery['unitaRicerca'] unitaRicerca = jsonQuery['unitaRicerca']
jsonQuery['Clausola0']['Attiva'] = "0"; jsonQuery['Clausola0']['Attiva'] = "0";
@ -1474,10 +1504,10 @@ $(document).ready(function() {
alert('Digitare una stringa da cercare') alert('Digitare una stringa da cercare')
return return
} }
if (jsonQuery['QueryAvanzata'] == 1 && (jsonQuery['EsprLogica'] == null || jsonQuery['EsprLogica'] == '')) { /*if (jsonQuery['QueryAvanzata'] == 1 && (jsonQuery['EsprLogica'] == null || jsonQuery['EsprLogica'] == '')) {
alert('Definire almeno una clausola del filtro di ricerca') alert('Definire almeno una clausola del filtro di ricerca')
return return
} }*/
if (jsonQuery['Clausola0']['lemma_forma'] == 'testo' && jsonQuery['Clausola0']['Attiva'] == 1 && jsonQuery['QueryAvanzata'] == 0) { if (jsonQuery['Clausola0']['lemma_forma'] == 'testo' && jsonQuery['Clausola0']['Attiva'] == 1 && jsonQuery['QueryAvanzata'] == 0) {
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'])
@ -1527,18 +1557,14 @@ $(document).ready(function() {
return return
} }
console.log("**** Nik *** "+jsonQuery)
jsonQuery = buildSQ(jsonQuery) jsonQuery = buildSQ(jsonQuery)
myquery = new sparqlGenerator().stringify(jsonQuery) myquery = new sparqlGenerator().stringify(jsonQuery)
console.log(myquery) console.log(myquery)
executeQuerySearch(myquery) executeQuerySearch(myquery)
// nik reset Advanced Search
if (fakeAdvancedSearch){
jsonQuery['QueryAvanzata'] = 0;
jsonQuery['Clausola0']['Attiva'] = "0";
}
} }
function executeLocalSearch(testo, forme, limit, cantica, cont, resultsInCantica, resultsInCanto) { function executeLocalSearch(testo, forme, limit, cantica, cont, resultsInCantica, resultsInCanto) {