Browse Source

start implementing getContext

Alessia 1 year ago
parent
commit
8427c6e3e7

+ 1 - 1
flask_be/app.py

@@ -49,7 +49,7 @@ def simpleContext():
         queryDTO = request.get_json()
         queryList = queryDTO['queryList']
         listResults = queryDTO['listResults']
-
+    
         output = handleGetContext(queryList, listResults, app.config['DATA_CONFIG'])
 
         app.logger.info('Request successfully executed, sending output')

+ 19 - 8
flask_be/engine/handle_request.py

@@ -1,4 +1,5 @@
 from .cooccorrenze import cooccorrenze
+from .basic_queries import basicQueries
 
 def handleOccGetQuery(queryList, cooccorrenzeObj, dataConfig):
 
@@ -26,6 +27,23 @@ def handleOccGetQuery(queryList, cooccorrenzeObj, dataConfig):
 
     return res
 
+#Funzione da sistemare per il recupero dei contesti
+def handleGetContext(queryList, listResults, dataConfig):
+
+    #res = []
+
+    #return {"error": "Hey, I'm not implemented yet"}
+
+    queryHandler = basicQueries(dataConfig)
+
+    query = queryList[0]
+    tipo = tempDecode(query['tipo'])
+    #lista = listResults[0]
+    print(tipo)
+
+    res = queryHandler.contestimultipli(tipo, listResults)
+
+    return res
 
 def tempDecode(stringa):
     if stringa=='forma':
@@ -35,11 +53,4 @@ def tempDecode(stringa):
     elif stringa=='lemma':
         return 2
     else:
-        return None
-
-#Funzione da sistemare per il recupero dei contesti
-def handleGetContext(queryList, listResults, dataConfig):
-
-    res = []
-
-    return {"error": "Hey, I'm not implemented yet"}
+        return None

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

@@ -158,7 +158,7 @@ def contestimultipli (tipo_ricerca, ricerca, listOcc, path):
 
 
 # %%
-path = "/Users/leonardocanova/Library/CloudStorage/OneDrive-ConsiglioNazionaledelleRicerche/TIGRO/Ricerche/db/first_db"
+path = "/Users/alessiaspadi/Desktop/Environments/Ricerche/dbfirst_db"
 listOcc = get_tables_occ(path)
 entry = "mezzo"
 tiporicerca= 1