Leonardo Canova 1 год назад
Родитель
Сommit
68fb87c5e1

+ 13 - 13
flask_be/engine/test/simple_query_test_pandas.py

@@ -65,7 +65,7 @@ def ricercaforme (entries, path, espansa, raddoppiata):
         else:
             theSimpleQuery = f"SELECT spec AS forma, nocc AS occ, cod FROM form WHERE spec LIKE {data} ORDER BY idfor"
 
-        con = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+        con = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
         answer_table = pd.read_sql(theSimpleQuery, con)
         if answer_table.empty:
             print ("Nessun risultato")
@@ -85,7 +85,7 @@ def ricercaforme (entries, path, espansa, raddoppiata):
         else:
             theSimpleQuery = f"SELECT DISTINCT spec AS forma, nocc AS occ, cod FROM form WHERE (spec LIKE {data}) OR (norm LIKE {data_norm}) ORDER BY idfor"
 
-        con = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+        con = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
         answer_table = pd.read_sql(theSimpleQuery, con)
         if answer_table.empty:
             print ("Nessun risultato")
@@ -133,7 +133,7 @@ def ricercalemmi (entries, path, espansa, raddoppiata):
         else:
             theSimpleQuery = f"SELECT spec AS lemma, cat AS cat_gr, omo AS disambiguatore, nocc AS occ, cod FROM lem WHERE spec LIKE {data} ORDER BY idlem"
 
-        con = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+        con = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
         answer_table = pd.read_sql(theSimpleQuery, con)
         if answer_table.empty:
             print ("Nessun risultato")
@@ -152,7 +152,7 @@ def ricercalemmi (entries, path, espansa, raddoppiata):
         else:
             theSimpleQuery = f"SELECT DISTINCT spec AS lemma, cat AS cat_gr, omo AS disambiguatore, nocc AS occ, cod FROM lem WHERE (spec LIKE {data}) OR (norm LIKE {data_norm}) ORDER BY idlem"
 
-        con = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+        con = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
         answer_table = pd.read_sql(theSimpleQuery, con)
         if answer_table.empty:
             print ("Nessun risultato")
@@ -198,7 +198,7 @@ def ricercaformelemmi (entries, path, espansa, raddoppiata):
             theSimpleQuery = f"SELECT form.spec AS forma, lem.spec AS lemma, lem.cat AS cat_gr, lem.omo AS disambiguatore, pfl.nocc AS occ, form.cod FROM pfl INNER JOIN form ON form.cod = pfl.forma INNER JOIN lem ON lem.cod = pfl.lemma WHERE form.spec LIKE {data} OR form.spec LIKE {doubleddata} ORDER BY form.idfor"
         else:
             theSimpleQuery = f"SELECT form.spec AS forma, lem.spec AS lemma, lem.cat AS cat_gr, lem.omo AS disambiguatore, pfl.nocc AS occ, form.cod FROM pfl INNER JOIN form ON form.cod = pfl.forma INNER JOIN lem ON lem.cod = pfl.lemma WHERE form.spec LIKE {data} ORDER BY form.idfor"
-        con = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+        con = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
         answer_table = pd.read_sql(theSimpleQuery, con)
         if answer_table.empty:
             print ("Nessun risultato")
@@ -214,7 +214,7 @@ def ricercaformelemmi (entries, path, espansa, raddoppiata):
             theSimpleQuery = f"SELECT DISTINCT form.spec AS forma, lem.spec AS lemma, lem.cat AS cat_gr, lem.omo AS disambiguatore, pfl.nocc AS occ, form.cod FROM pfl INNER JOIN form ON form.cod = pfl.forma INNER JOIN lem ON lem.cod = pfl.lemma WHERE (form.spec LIKE {data}) OR (form.norm LIKE {data_norm}) OR (form.spec LIKE {doubleddata}) OR (form.norm LIKE {doubleddata_norm}) ORDER BY form.idfor"
         else:
             theSimpleQuery = f"SELECT DISTINCT form.spec AS forma, lem.spec AS lemma, lem.cat AS cat_gr, lem.omo AS disambiguatore, pfl.nocc AS occ, form.cod FROM pfl INNER JOIN form ON form.cod = pfl.forma INNER JOIN lem ON lem.cod = pfl.lemma WHERE (form.spec LIKE {data}) OR (form.norm LIKE {data_norm}) ORDER BY form.idfor"
-        con = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+        con = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
         answer_table = pd.read_sql(theSimpleQuery, con)
         if answer_table.empty:
             print ("Nessun risultato")
@@ -261,7 +261,7 @@ def ricercalemmiforme (entries, path, espansa, raddoppiata):
             theSimpleQuery = f"SELECT lem.spec AS lemma, lem.cat AS cat_gr, form.spec AS forma, lem.omo AS disambiguatore, pfl.nocc AS occ, lem.cod FROM pfl INNER JOIN form ON form.cod = pfl.forma INNER JOIN lem ON lem.cod != 0 AND lem.cod = pfl.lemma WHERE lem.spec LIKE {data} OR form.spec LIKE {doubleddata} ORDER BY lem.idlem"
         else:
             theSimpleQuery = f"SELECT lem.spec AS lemma, lem.cat AS cat_gr, form.spec AS forma, lem.omo AS disambiguatore, pfl.nocc AS occ, lem.cod FROM pfl INNER JOIN form ON form.cod = pfl.forma INNER JOIN lem ON lem.cod != 0 AND lem.cod = pfl.lemma WHERE lem.spec LIKE {data} ORDER BY lem.idlem"
-        con = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+        con = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
         answer_table = pd.read_sql(theSimpleQuery, con)
         if answer_table.empty:
             print ("Nessun risultato")
@@ -277,7 +277,7 @@ def ricercalemmiforme (entries, path, espansa, raddoppiata):
             theSimpleQuery = f"SELECT DISTINCT lem.spec AS lemma, lem.cat AS cat_gr, form.spec AS forma, lem.omo AS disambiguatore, pfl.nocc AS occ, lem.cod FROM pfl INNER JOIN form ON form.cod = pfl.forma INNER JOIN lem ON lem.cod = pfl.lemma WHERE (lem.spec LIKE {data}) OR (lem.norm LIKE {data_norm}) OR (lem.spec LIKE {doubleddata}) OR (lem.norm LIKE {doubleddata_norm}) ORDER BY lem.idlem"
         else:
             theSimpleQuery = f"SELECT DISTINCT lem.spec AS lemma, lem.cat AS cat_gr, form.spec AS forma, lem.omo AS disambiguatore, pfl.nocc AS occ, lem.cod FROM pfl INNER JOIN form ON form.cod = pfl.forma INNER JOIN lem ON lem.cod = pfl.lemma WHERE (lem.spec LIKE {data}) OR (lem.norm LIKE {data_norm}) ORDER BY lem.idlem"
-        con = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+        con = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
         answer_table = pd.read_sql(theSimpleQuery, con)
         if answer_table.empty:
             print ("Nessun risultato")
@@ -318,7 +318,7 @@ def ricercalemmiforme (entries, path, espansa, raddoppiata):
 # %% Ricerca per categorie grammaticali
 def ricercacatgr (entry, path):
         theSimpleQuery = f"SELECT spec AS lemma, cat AS cat_gr, omo AS disambiguatore, nocc AS occ, cod FROM lem WHERE cat = '{entry}' ORDER BY idlem"
-        con = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+        con = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
         answer_table = pd.read_sql(theSimpleQuery, con)
         if answer_table.empty:
             print ("Nessun risultato")
@@ -327,10 +327,10 @@ def ricercacatgr (entry, path):
             return answer_table
 
 #%% 
-path = "/Users/leonardocanova/Library/CloudStorage/OneDrive-ConsiglioNazionaledelleRicerche/TIGRO/Ricerche/flask_be"
-entry = "agg."
-df=ricercacatgr(entry, path)
-#df=ricercaforme(interpreter(entry), path, 0, 0)
+path = "/Users/leonardocanova/Library/CloudStorage/OneDrive-ConsiglioNazionaledelleRicerche/TIGRO/Ricerche/db/first_db"
+entry = "filius"
+#df=ricercacatgr(entry, path)
+df=ricercaforme(interpreter(entry), path, 0, 0)
 print (counter(df))
 dtale.show(df)
 # %%

+ 13 - 13
flask_be/engine/test/test_contesti_singoli.py

@@ -11,7 +11,7 @@ def singlecontexts(textlist, index, parole, periodi, brani, listOcc, path):
     context = textlist.iloc[index]
     contexts = []
     formats = []
-    con = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+    con = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
     sigla = textlist.loc[index, "sigla"]
     periodlocal = textlist.loc[index, "numperiod"]
     ntxlocal = textlist.loc[index, "ntx"]
@@ -23,11 +23,11 @@ def singlecontexts(textlist, index, parole, periodi, brani, listOcc, path):
             query = f"SELECT tab.pitxt, tab.elemlen FROM {table} AS tab WHERE tab.ntx = {ntxlocal} AND tab.mappa <= {mappalocal+int(parole/2)} AND tab.mappa >= {mappalocal-int(parole/2)}"
             queryresponse = pd.read_sql(query, con)
             pointerlist = pd.concat([pointerlist, queryresponse])
-        with open(f"{path}/db/itxt/{sigla}", 'r', encoding="utf-32-le") as file1:
+        with open(f"{path}/itxt/{sigla}", 'r', encoding="utf-32-le") as file1:
             file1.seek(4*pointerlist["pitxt"].min())
             cont = file1.read(pointerlist["pitxt"].max()-pointerlist["pitxt"].min())
             contexts.append(cont)
-        with open(f"{path}/db/ftxt/{sigla}", 'rb') as file1:
+        with open(f"{path}/ftxt/{sigla}", 'rb') as file1:
             file1.seek(pointerlist["pitxt"].min()-1)
             formBytes = file1.read(pointerlist["pitxt"].max()-pointerlist["pitxt"].min())
             form = [byte for byte in formBytes]
@@ -37,7 +37,7 @@ def singlecontexts(textlist, index, parole, periodi, brani, listOcc, path):
     elif periodi != 0:
         query = f"SELECT piniz, pfin FROM periodi WHERE ntx = {ntxlocal} AND numperiod <= {periodlocal+int(periodi/2)} AND numperiod >= {periodlocal-int(periodi/2)}"
         queryresponse = pd.read_sql(query, con)
-        with open(f"{path}/db/itxt/{sigla}", 'r', encoding="utf-32-le") as file1:
+        with open(f"{path}/itxt/{sigla}", 'r', encoding="utf-32-le") as file1:
             file1.seek(4*queryresponse["piniz"].min())
             cont = file1.read(queryresponse["pfin"].max()-queryresponse["piniz"].min())
             contexts.append(cont)
@@ -50,7 +50,7 @@ def singlecontexts(textlist, index, parole, periodi, brani, listOcc, path):
             numbranolocal = textlist.loc[index, "numbrano"]
             query = f"SELECT piniz, pfin FROM linkbase WHERE {ntxlocal} = ntx AND tipo = 2 AND id BETWEEN {numbranolocal-int(brani/2)} AND {numbranolocal+int(brani/2)}"
             queryresponse = pd.read_sql(query, con)
-            with open(f"{path}/db/itxt/{sigla}", 'r', encoding="utf-32-le") as file1:
+            with open(f"{path}/itxt/{sigla}", 'r', encoding="utf-32-le") as file1:
                 file1.seek(4*queryresponse["piniz"].min())
                 cont = file1.read(queryresponse["pfin"].max()-queryresponse["piniz"].min())
                 contexts.append(cont)
@@ -63,7 +63,7 @@ def singlecontexts(textlist, index, parole, periodi, brani, listOcc, path):
 
 #%% funzione di ricerca dei brani associati. Ha in input singlecontexts.
 def findlinks (context, path):
-    con = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+    con = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
     linkslocal = context.loc[0, "links"]
     siglalocal = context.loc[0, "sigla"]
     ntxlocal = context.loc[0, "ntx"]
@@ -75,7 +75,7 @@ def findlinks (context, path):
     if linkslocal == 1:
         query = f"SELECT ta.ntx, ta.id, ta.piniz, ta.pfin, tb.mappain, tb.mappafin FROM linkbase AS tb INNER JOIN linknoteass AS ta ON tb.ntx = ta.ntx AND tb.id = ta.id WHERE (((tb.tipo= 1) AND (tb.ntx = {ntxlocal})) AND ((tb.piniz BETWEEN {pinizlocal} AND {pfinlocal}) OR ({pitxtlocal} BETWEEN tb.piniz AND tb.pfin)))"
         queryresponse = pd.read_sql(query, con)
-        with open(f"{path}/db/itxt/{siglalocal}", 'r', encoding="utf-32-le") as file1:
+        with open(f"{path}/itxt/{siglalocal}", 'r', encoding="utf-32-le") as file1:
                 file1.seek(4*queryresponse["piniz"].min())
                 cont = file1.read(queryresponse["pfin"].max()-queryresponse["piniz"].min()-1)
         context['nota'] = cont
@@ -83,20 +83,20 @@ def findlinks (context, path):
     if linkslocal == 2:
         query = f"SELECT ta.ntx, ta.id, ta.piniz, ta.pfin, tb.mappain, tb.mappafin FROM linkbase AS tb INNER JOIN linknoteass AS ta ON tb.ntx = ta.ntx AND tb.id = ta.id WHERE (((tb.tipo= 2) AND (tb.ntx = {ntxlocal})) AND ((tb.piniz BETWEEN {pinizlocal} AND {pfinlocal}) OR ({pitxtlocal} BETWEEN tb.piniz AND tb.pfin)))"
         queryresponse = pd.read_sql(query, con)
-        with open(f"{path}/db/itxt/{siglalocal}", 'r', encoding="utf-32-le") as file1:
+        with open(f"{path}/itxt/{siglalocal}", 'r', encoding="utf-32-le") as file1:
                 file1.seek(4*queryresponse["piniz"].min())
                 cont = file1.read(queryresponse["pfin"].max()-queryresponse["piniz"].min()-1)
         context['testo associato'] = cont
     if linkslocal == 3:
         query = f"SELECT ta.ntx, ta.id, ta.piniz, ta.pfin, tb.piniz AS iniz, tb.pfin AS fin, tb.mappain, tb.mappafin FROM linkbase AS tb INNER JOIN linknoteass AS ta ON tb.ntx = ta.ntx AND tb.id = ta.id WHERE (((tb.tipo= 1) AND (tb.ntx = {ntxlocal})) AND ((tb.piniz BETWEEN {pinizlocal} AND {pfinlocal}) OR ({pitxtlocal} BETWEEN tb.piniz AND tb.pfin)))"
         queryresponse = pd.read_sql(query, con)
-        with open(f"{path}/db/itxt/{siglalocal}", 'r', encoding="utf-32-le") as file1:
+        with open(f"{path}/itxt/{siglalocal}", 'r', encoding="utf-32-le") as file1:
                 file1.seek(4*queryresponse["piniz"].min())
                 cont = file1.read(queryresponse["pfin"].max()-queryresponse["piniz"].min()-1)
         context['nota'] = cont
         query2 = f"SELECT ta.ntx, ta.id, ta.piniz, ta.pfin, tb.piniz AS iniz, tb.pfin AS fin, tb.mappain, tb.mappafin FROM linkbase AS tb INNER JOIN linknoteass AS ta ON tb.ntx = ta.ntx AND tb.id = ta.id WHERE (((tb.tipo= 2) AND (tb.ntx = {ntxlocal})) AND ((tb.piniz BETWEEN {pinizlocal} AND {pfinlocal}) OR ({pitxtlocal} BETWEEN tb.piniz AND tb.pfin)))"
         queryresponse2 = pd.read_sql(query2, con)
-        with open(f"{path}/db/itxt/{siglalocal}", 'r', encoding="utf-32-le") as file2:
+        with open(f"{path}/itxt/{siglalocal}", 'r', encoding="utf-32-le") as file2:
                 file2.seek(4*queryresponse2["piniz"].min())
                 cont2 = file2.read(queryresponse2["pfin"].max()-queryresponse2["piniz"].min()-1)
         context['testo associato'] = cont2
@@ -107,11 +107,11 @@ def singlefindbib(contexts, path):
     infobib = pd.DataFrame()
     rif_org = pd.DataFrame()
     for ind, row in contexts.iterrows():
-        con = sqlite3.connect(f"file:{path}/db/bibliografia/BiblioTLIO.db?mode=ro", uri=True)
+        con = sqlite3.connect(f"file:{path}/bibliografia/BiblioTLIO.db?mode=ro", uri=True)
         Query = f"SELECT [Anno iniziale], [Titolo Abbreviato], IQ FROM datibib WHERE Sigla='{row['sigla']}'"
         bib = pd.read_sql(Query, con)
         infobib = pd.concat([infobib, bib])
-        con2 = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+        con2 = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
         Query2 = f"SELECT head AS Rif_organico, full AS Rif_completo FROM org WHERE (indice='{row['numorg']}' AND ntx='{row['ntx']}')"
         rif = pd.read_sql(Query2, con2)
         rif_org = pd.concat([rif_org, rif])
@@ -142,7 +142,7 @@ def singlefindbib(contexts, path):
 
 # %%
 parola = "filius"
-path = "/Users/leonardocanova/Library/CloudStorage/OneDrive-ConsiglioNazionaledelleRicerche/TIGRO/Ricerche/flask_be"
+path = "/Users/leonardocanova/Library/CloudStorage/OneDrive-ConsiglioNazionaledelleRicerche/TIGRO/Ricerche/db/first_db"
 # tipo di ricerca (0 per forme, 1 per lemmi, 2 per lemmi con opzione "mostra occorrenze non lemmatizzate")
 type= 0
 listOcc = ["occ00001", "occ00002", "occ00003"]

+ 1 - 1
flask_be/engine/test/test_cooccorrenze.py

@@ -130,7 +130,7 @@ def ricerca_cooccorrenze (listaricerche, intervallo, periodo, ordinate, path):
 
 # %%
 ricerca = [["agg.", "3"], ["avere", "1", 0, 0]]
-cooccorrenze = ricerca_cooccorrenze(ricerca, 10, 1, 1, "/Users/leonardocanova/Library/CloudStorage/OneDrive-ConsiglioNazionaledelleRicerche/TIGRO/Ricerche/flask_be/")
+cooccorrenze = ricerca_cooccorrenze(ricerca, 10, 1, 1, "/Users/leonardocanova/Library/CloudStorage/OneDrive-ConsiglioNazionaledelleRicerche/TIGRO/Ricerche/db/first_db")
 dtale.show(cooccorrenze)
 
 # %%

+ 6 - 6
flask_be/engine/test/test_occorrenzario_pandas.py

@@ -10,7 +10,7 @@ from simple_query_test_pandas import ricercaforme, ricercalemmi, ricercaformelem
 def findtexts(type, df, listOcc, path):
     textlist = pd.DataFrame()
     codlist = list(df["cod"])
-    con = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+    con = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
     for table in listOcc:
         strlist = ",".join(str(c) for c in codlist)
         if type == 0:
@@ -36,7 +36,7 @@ def findtexts(type, df, listOcc, path):
 
 def findcontexts(textlist, parole, periodi, listOcc, path):
     contexts = []
-    con = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+    con = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
     for ind, row in textlist.iterrows():
         pitxtLocal = row["pitxt"]
         sigla = row["sigla"]
@@ -48,7 +48,7 @@ def findcontexts(textlist, parole, periodi, listOcc, path):
             query = f"SELECT tab.pitxt, tab.elemlen FROM {table} AS tab WHERE tab.ntx = {ntxlocal} AND tab.mappa <= {mappalocal+int(parole/2)} AND tab.mappa >= {mappalocal-int(parole/2)}"
             queryresponse = pd.read_sql(query, con)
             pointerlist = pd.concat([pointerlist, queryresponse])
-        with open(f"{path}/db/itxt/{sigla}", 'r', encoding="utf-32-le") as file1:
+        with open(f"{path}/itxt/{sigla}", 'r', encoding="utf-32-le") as file1:
             file1.seek(4*pointerlist["pitxt"].min())
             cont = file1.read(pointerlist["pitxt"].max()-pointerlist["pitxt"].min())
             contexts.append(cont)
@@ -61,11 +61,11 @@ def findbib(contexts, path):
     infobib = pd.DataFrame()
     rif_org = pd.DataFrame()
     for ind, row in contexts.iterrows():
-        con = sqlite3.connect(f"file:{path}/db/bibliografia/BiblioTLIO.db?mode=ro", uri=True)
+        con = sqlite3.connect(f"file:{path}/bibliografia/BiblioTLIO.db?mode=ro", uri=True)
         Query = f"SELECT [Anno iniziale], [Titolo Abbreviato], IQ FROM datibib WHERE Sigla='{row['sigla']}'"
         bib = pd.read_sql(Query, con)
         infobib = pd.concat([infobib, bib])
-        con2 = sqlite3.connect(f"file:{path}/db/test1.db?mode=ro", uri=True)
+        con2 = sqlite3.connect(f"file:{path}/test1.db?mode=ro", uri=True)
         Query2 = f"SELECT head AS Rif_organico, full AS Rif_completo FROM org WHERE (indice='{row['numorg']}' AND ntx='{row['ntx']}')"
         rif = pd.read_sql(Query2, con2)
         rif_org = pd.concat([rif_org, rif])
@@ -88,7 +88,7 @@ def findbib(contexts, path):
 
 
 # %%
-path = "/Users/leonardocanova/Library/CloudStorage/OneDrive-ConsiglioNazionaledelleRicerche/TIGRO/Ricerche/flask_be"
+path = "/Users/leonardocanova/Library/CloudStorage/OneDrive-ConsiglioNazionaledelleRicerche/TIGRO/Ricerche/db/first_db"
 entry = "prep."
 type= 1
 numeroparole = 30