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

Fixed Parzialmente ricerca Avanzata con set Morfologiche

This commit is contained in:
nicola 2024-11-20 18:28:41 +01:00
parent a57c9d3f87
commit 25afe13370
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/browseMgr.js
View File

@ -1448,14 +1448,26 @@ $(document).ready(function() {
cleanSearchResult()
esprlogica = []
jsonQuery = getJsonQuery()
var clausola;
var fakeAdvancedSearch = false;
if (jsonQuery['QueryAvanzata'] == 0){ // ricerca semplice
unitaRicerca = 'forma'
jsonQuery['Clausola0']['queryText'] = $("#queryText")[0].value; // work around to fix simple query
jsonQuery['Clausola0']['Attiva'] = "1";
}
else{
unitaRicerca = jsonQuery['unitaRicerca']
clausola = jsonQuery['Clausola1'];
if (clausola == null){
unitaRicerca = 'forma'
jsonQuery['Clausola0']['queryText'] = $("#queryTextUnita")[0].value; // work around to fix simple query
jsonQuery['Clausola0']['Attiva'] = "1";
jsonQuery['unitaRicerca'] = "forma";
jsonQuery['QueryAvanzata'] = 0;
fakeAdvancedSearch = true;
}else{
unitaRicerca = jsonQuery['unitaRicerca']
jsonQuery['Clausola0']['Attiva'] = "0";
}
}
console.log("got json query, unita ricerca: " + unitaRicerca)
if (jsonQuery['QueryAvanzata'] == 0 && jsonQuery['Clausola0']['queryText'] == '') {
@ -1521,6 +1533,12 @@ $(document).ready(function() {
console.log(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) {

7
js/script_4.7.js
View File

@ -155,7 +155,6 @@ $(document).ready(function() {
$("#collapseLogic").collapse('show');
});
});
});
$('#searchSimple').on('click', function() {
@ -798,7 +797,7 @@ $(document).ready(function() {
$('#cla' + tabID + " #queryTextN").attr("id","queryText" + tabID);
$('#cla' + tabID + " #opzioni_testoN").attr("id","opzioni_testo" + tabID);
$('#cla' + tabID + " #contextDivN").attr("id","contextDiv" + tabID);
//addClaContext(tabID);
addClaContext(tabID);
}
// Funzione di creazione delle subclausole grammaticali basate sul valore scelto
@ -931,7 +930,7 @@ $(document).ready(function() {
//$('#cla' + tabID + " #queryTextN").attr("id","queryText" + tabID);
//$('#cla' + tabID + " #opzioni_testoN").attr("id","opzioni_testo" + tabID);
// $('#cla' + tabID + " #contextDivN").attr("id","contextDiv" + tabID);
addClaContext(tabID);
// addClaContext(tabID);
}
// Funzione di creazione del tab delle clausole metafore
@ -1503,6 +1502,8 @@ $(document).ready(function() {
$("#contextText-xX" + claIdNum).html("Tutta l'opera.");
window["context" + claIdNum] = JSON.parse(JSON.stringify(contextEmpty));
$('#selectable-xX' + claIdNum + " .show").removeClass("show");
$("#contextDiv" + claIdNum).hide(); //Nik work around per non mostrare context
};
function resetAdvGui() {