From b87fe4b1d003e142768dd86f8f2ccae4b1470268 Mon Sep 17 00:00:00 2001 From: Luca Trupiano Date: Fri, 21 Oct 2022 14:56:48 +0200 Subject: [PATCH] aggiunti try-catch error sulla query e controllo sul valore undefined --- js/script_Luk_Q.js | 75 ++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 32 deletions(-) diff --git a/js/script_Luk_Q.js b/js/script_Luk_Q.js index b39760a..be011a7 100644 --- a/js/script_Luk_Q.js +++ b/js/script_Luk_Q.js @@ -456,38 +456,49 @@ $(document).ready(function() { $('#resultsId1').empty(); $('#resultsId1').addClass("small pb-2") $("#risultatitesto").empty(); - bindingsStream.on('data', (binding) => { - //console.log(binding.toString()); // Quick way to print bindings for testing - //console.log(binding.has('sub')); // Will be true - latestVerso = binding.get('Verso').value - latestResult = rowNum + '. "' + latestVerso.replace(binding.get('Forma').value, '*' + binding.get('Forma').value + '*') + '" (' + binding.get('Cantica').value + ', ' + binding.get('Canto').value + ', Verso ' + binding.get('NumeroVerso').value + ')\n'; - $("#risultatitesto").append(latestResult); - resultTablePart4 = '' + rowNum++ + ''; - for (var i = 0; i < queryFields.length; i++) { - resultTablePart4 = resultTablePart4 + '' + binding.get(queryFields[i]).value + ""; - }; - resultTable = resultTable + resultTablePart4 + ''; - $("#loader").hide(); - }); - bindingsStream.on('end', () => { - $("#loader").hide(); - resultTable = resultTable + resultTablePart5; - $("#resultsId1").append(resultTable); - $("#copiaTesto").prop("disabled", false); - $('#resultTable').DataTable( { - colReorder: true, - language: { - url: 'dataTables.it-IT.json' - }, - //dom: 'Blfrtip', - dom: "<'row'<'col-sm-12 col-md-6'l><'col-sm-6 col-md-3'f><'col-sm-6 col-md-3 text-right'B>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>", - buttons: [ 'copy', 'excel', 'print' ] - }); - setTimeout(function(){ - buttonDiv = $("#resultsId1").find(".buttons-copy"); - $('').insertBefore(buttonDiv); - },300); - }); + try { + bindingsStream.on('data', (binding) => { + //console.log(binding.toString()); // Quick way to print bindings for testing + //console.log(binding.has('sub')); // Will be true + latestVerso = binding.get('Verso').value + latestResult = rowNum + '. "' + latestVerso.replace(binding.get('Forma').value, '*' + binding.get('Forma').value + '*') + '" (' + binding.get('Cantica').value + ', ' + binding.get('Canto').value + ', Verso ' + binding.get('NumeroVerso').value + ')\n'; + $("#risultatitesto").append(latestResult); + resultTablePart4 = '' + rowNum++ + ''; + for (var i = 0; i < queryFields.length; i++) { + if ( binding.get(queryFields[i]) != null){ + val = binding.get(queryFields[i]).value + } else { + val = "na" + } + resultTablePart4 = resultTablePart4 + '' + val + ""; + }; + resultTable = resultTable + resultTablePart4 + ''; + $("#loader").hide(); + }); + bindingsStream.on('end', () => { + $("#loader").hide(); + resultTable = resultTable + resultTablePart5; + $("#resultsId1").append(resultTable); + $("#copiaTesto").prop("disabled", false); + $('#resultTable').DataTable( { + colReorder: true, + language: { + url: 'dataTables.it-IT.json' + }, + //dom: 'Blfrtip', + dom: "<'row'<'col-sm-12 col-md-6'l><'col-sm-6 col-md-3'f><'col-sm-6 col-md-3 text-right'B>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>", + buttons: [ 'copy', 'excel', 'print' ] + }); + setTimeout(function(){ + buttonDiv = $("#resultsId1").find(".buttons-copy"); + $('').insertBefore(buttonDiv); + },300); + }); + } + catch(err) { + console.log(err.message); + $("#loader").hide(); + }; }; // Funzione di creazione del tab delle clausole grammaticali