mini-fix in context BE/FE communication

flask_be/app.py

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

flask_be/engine/cooccorrenze.py

@@ -41,12 +41,12 @@ class cooccorrenze(basicQueries):
                 search = self.sendBasicQuery(ricerca, 'lemma', espansa, raddoppiata, pandas=True)
      
             textlist = self.findtexts(tipo, search)
-            df_new = pd.DataFrame(columns=list(listatesti.columns))
             cod_cols = []
 
             ##########################################
             # KORA: questo blocco sembra troppo lento!
             ##########################################
+            df_new = pd.DataFrame(columns=list(listatesti.columns))
             for index1, row1 in listatesti.iterrows():
                 for index2, row2 in textlist.iterrows():
                     cond1 = row1['ntx'] == row2['ntx']
@@ -63,6 +63,24 @@ class cooccorrenze(basicQueries):
             # KORA: fino a qui
             ##########################################
 
+            ##########################################
+            # KORA: questa è un'alternativa
+            ##########################################
+            df_new = pd.DataFrame(columns=list(listatesti.columns))
+            for index1, row1 in listatesti.iterrows():
+                ntx1 = row1['ntx']
+                mappa1 = row1['mappa']
+
+                df_temp = textlist[(textlist['ntx'].astype(int) == ntx1) & (textlist['mappa'].astype(int) > mappa1-intervallo)  & (textlist['mappa'].astype(int) < mappa1+intervallo)  & (textlist['mappa'].astype(int) != mappa1)]
+
+                #(textlist['ntx'].astype(int) == ntx1) & (textlist['mappa'].astype(int) in range(mappa1-intervallo, mappa1+intervallo)) & 
+                #& (textlist['mappa'] in range(mappa1-intervallo, mappa1+intervallo)) & (textlist['mappa'] != mappa1)]
+                df_new = pd.concat([df_new, df_temp])
+
+            ##########################################
+            # KORA: fino a qui
+            ##########################################
+
 
             listatesti = df_new
 

flask_be/engine/handle_request.py

@@ -42,4 +42,4 @@ def handleGetContext(queryList, listResults, dataConfig):
 
     res = []
 
-    return "Hey, I'm returning"
+    return {"error": "Hey, I'm not implemented yet"}

site2/js/ricerca.js

@@ -211,7 +211,9 @@ function checkContext() {
 
   getData('/get_context', queryDTO)
   // After request finishes, process response data
-  .done(response => processContext(response));
+  .done(response => processContext(response))
+  .fail(err => console.log("Something went wrong!"))
+//  .always(response => console.log(response));
 }