Merge branch 'master' of http://dev.restore.ovi.cnr.it:3000/TEAMOVI/Ricerche

flask_be/engine/basic_queries.py

@@ -54,7 +54,7 @@ class basicQueries:
             if type==2:
                 subQueryData = {'queryType': 'pfl', 'codList': codList}
                 subdf = self.queryHandler.query(subQueryData, pandas=True)
-                queryData['formCodList'] = list(subdf["forma"])
+                queryData['formCodList'] = list(subdf['codForma'])
 
             extendequeryReponse = self.queryHandler.query(queryData, pandas=True)
 

flask_be/interface_sqlite3/query_handlers.py

@@ -195,7 +195,7 @@ def prepareQueryString(queryData):
             raise KeyError('Missing required data for query type ' + type + ': ' + str(err))
 
         strlist = ",".join(str(c) for c in codList)
-        return f"SELECT DISTINCT lemma, forma FROM pfl WHERE lemma IN ({strlist})"
+        return f"SELECT DISTINCT lemma as codLemma, forma as codForma FROM pfl WHERE lemma IN ({strlist})"
 
     ###################
     elif type=='texts':