query in progress

js/browseMgr_5.0.js

@@ -1,7 +1,7 @@
 /**
  * 
  */
-import { getVersiConCitazioni, queryRiferimenti, getListaRis, cleanListaRis} from './dataMgr.js';
+import { getVersiConCitazioni, queryRiferimenti, getListaRis, cleanListaRis, getContextLastP} from './dataMgr.js';
 import { getJsonQuery, emptyStructCard } from './script_5.0.js';
 import {resetGraphStr} from './syntgraph_5.0.js'
 
@@ -316,7 +316,9 @@ $(document).ready(function() {
 					continue;
 				}
 				numeroRisultati = numeroRisultati + 1;
+				//getContextLastP(risultato, contextLength)
 				ultimaPosizione = getContextLastPosition(risultato, contextLength);
+				//console.log(ultimaPosizione)
 			}
 			numeroContesti = numeroRisultati
 			return (numeroRisultati)
@@ -1876,7 +1878,7 @@ $(document).ready(function() {
 				titolocanto.appendTo(divcanto)
 				//nuovo
 				var olversi = $('<ol />')
-				olversi.attr('class', 'pb-4')
+				olversi.attr('class', 'pb-4 pr-4')
 				olversi.appendTo(divcanto)
 				//fine nuovo
 				divcanto.appendTo('#displaycanto')

js/dataMgr.js

@@ -41,6 +41,12 @@ const conn = await db.connect();
 await conn.query(`
     CREATE TABLE riferimenti AS
         SELECT * FROM "https://lida.dantenetwork.it/js/data/riferimenti_3.parquet";
+	CREATE TABLE prima AS
+		        SELECT * FROM "https://lida.dantenetwork.it/js/data/inf.parquet";
+	CREATE TABLE seconda AS
+				SELECT * FROM "https://lida.dantenetwork.it/js/data/pur.parquet";
+	CREATE TABLE terza AS
+				SELECT * FROM "https://lida.dantenetwork.it/js/data/par.parquet";
 `);
 
 var table = await conn.query(`
@@ -75,6 +81,12 @@ const result4 = table1.toArray().map((row) => row.toJSON());
 rif_fonti = result4.map((x) => x['TiFo']);
 
 //console.log(rif_fonti)
+var tableP = await conn.query(`
+        select * from terza limit 10;
+`);
+const result5 = tableP.toArray().map((row) => row.toJSON());
+console.log(result5)
+
 await conn.close();
 
 console.log('done')
@@ -302,4 +314,31 @@ function filtroContesto(marray, cantica, op) {
 		console.log(filtrost)
 	}
 	return filtrost
-}    
+} 
+
+//Contesto
+
+export async function getContextLastP(formaid, numversi = 3) {
+
+	var listaforme = 'prima';
+
+	
+	if (parseInt(formaid) > 33373 && parseInt(formaid) < 66588) {
+		listaforme = 'seconda';
+
+	}
+	if (parseInt(formaid) > 66587 && parseInt(formaid) < 99314) {
+		listaforme = 'terza';
+
+	}
+	const tconn = await db.connect();
+	var querycnt = 'select index, Text, Position, IRI from '+listaforme+" where Position='"+formaid+"'"
+	var rs = await tconn.query(querycnt)
+	var result4 = rs.toArray().map((row) => row.toJSON());
+	console.log("                "+formaid)
+	console.log(result4[0]['index'])
+	console.log('-----------------------------------------')
+	console.log(parseInt(result4[0]['index'])+10)
+	await tconn.close();
+
+}

js/utilsMgr_5.0.js

@@ -481,7 +481,7 @@ function buildSQ(stquery) {
 			return (myquery)
 		}
 
-	}
+	
 	if (((stquery[clause]['typeSyntax0'].trim() != '' && stquery[clause]['typeSyntax0'].trim() != '.+') ||
 			(stquery[clause]['functionSyntax'].trim() != '' && stquery[clause]['functionSyntax'].trim() != '.+')) && 
 	    	stquery[clause]['typeGramm0'].trim() != 'all') {//entrambi i filtri
@@ -522,7 +522,7 @@ function buildSQ(stquery) {
 		return multipleCondSpQuery;
 		
 	}
-	
+	}
 	//Simple query
 
 	filtroContestoJson = getFiltroContestoJson(JSON.parse(stquery['Clausola0']['contesto']))