From c0f552b9517d3c58998e386f836726c47aedbbf4 Mon Sep 17 00:00:00 2001
From: nicola <nicola@localhost>
Date: Fri, 29 Nov 2024 18:23:27 +0100
Subject: [PATCH] fixed some bugs

---
 js/browseMgr.js | 62 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 18 deletions(-)

diff --git a/js/browseMgr.js b/js/browseMgr.js
index 3f4938e..47aa603 100644
--- a/js/browseMgr.js
+++ b/js/browseMgr.js
@@ -1448,22 +1448,52 @@ $(document).ready(function() {
 		cleanSearchResult()
 		esprlogica = []
 		jsonQuery = getJsonQuery()
-		var clausola;
-		var fakeAdvancedSearch = false;
-		if (jsonQuery['QueryAvanzata'] == 0){ // ricerca semplice
+		var clausola = jsonQuery['Clausola1'];
+		var qterm;
+		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'
-			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";
 		}
 		else{
-			clausola = jsonQuery['Clausola1'];
+			//clausola = jsonQuery['Clausola1'];
 			if (clausola == null){
-				unitaRicerca = 'forma'
-				jsonQuery['Clausola0']['queryText'] = $("#queryTextUnita")[0].value; // work around to fix simple query
+				unitaRicerca = $('#unitaRicerca').val();//'forma' opzioni_testoUnita
+				$('#cleanresult2').trigger('click');
+				//jsonQuery['Clausola0']['queryText'] = $("#queryTextUnita")[0].value; // NIK work around to fix simple query
+				
 				jsonQuery['Clausola0']['Attiva'] = "1";
-				jsonQuery['unitaRicerca'] = "forma";
-				jsonQuery['QueryAvanzata'] = 0;
-				fakeAdvancedSearch = true;
+				jsonQuery['unitaRicerca'] = unitaRicerca;// "forma";
+				switch (unitaRicerca) {
+							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{				
 				unitaRicerca = jsonQuery['unitaRicerca']
 				jsonQuery['Clausola0']['Attiva'] = "0";
@@ -1474,10 +1504,10 @@ $(document).ready(function() {
 			alert('Digitare una stringa da cercare')
 			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')
 			return
-		}
+		}*/
 		if (jsonQuery['Clausola0']['lemma_forma'] == 'testo' && jsonQuery['Clausola0']['Attiva'] == 1 && jsonQuery['QueryAvanzata'] == 0) {
 			searchwords = jsonQuery['Clausola0']['queryText'].trim().split(' ')
 			var contesto = JSON.parse(jsonQuery['Clausola0']['contesto'])
@@ -1527,18 +1557,14 @@ $(document).ready(function() {
 
 			return
 		}
+		console.log("**** Nik *** "+jsonQuery)
+
 		jsonQuery = buildSQ(jsonQuery)
 
 		myquery = new sparqlGenerator().stringify(jsonQuery)
 		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) {