diff --git a/elab_orchestrator.py b/elab_orchestrator.py index c036cad..a5f4997 100755 --- a/elab_orchestrator.py +++ b/elab_orchestrator.py @@ -74,15 +74,15 @@ async def worker(worker_id: int, cfg: object, pool: object) -> None: else: logger.info(stdout.decode().strip()) await update_status(cfg, id, DATA_ELABORATED, pool) - if not tool_elab_info["duedate"] or tool_elab_info["duedate"] in ('0000-00-00 00:00:00', '') or tool_elab_info["duedate"] > timestamp_matlab_elab: - if tool_elab_info['ftp_send']: + if tool_elab_info['ftp_send']: + if not tool_elab_info["duedate"] or tool_elab_info["duedate"] in ('0000-00-00 00:00:00', '') or tool_elab_info["duedate"] > timestamp_matlab_elab: if elab_csv := await get_data_as_csv(cfg, id, unit_name, tool_name, timestamp_matlab_elab, pool): print(elab_csv) #if await send_csv_to_customer(cfg, id, unit_name, tool_name, elab_csv, pool): #await update_status(cfg, id, DATA_SENT, pool) await update_status(cfg, id, DATA_SENT, pool) - else: - logger.info(f"id {id} - {unit_name} - {tool_name} {tool_elab_info['duedate']}: ftp put didn't executed because due date reached.") + else: + logger.info(f"id {id} - {unit_name} - {tool_name} {tool_elab_info['duedate']}: ftp put didn't executed because due date reached.") await unlock(cfg, id, pool) await asyncio.sleep(ELAB_PROCESSING_DELAY) diff --git a/utils/database/elab_query.py b/utils/database/elab_query.py index c12c40d..51d3857 100644 --- a/utils/database/elab_query.py +++ b/utils/database/elab_query.py @@ -47,7 +47,7 @@ async def get_data_as_csv(cfg: dict, id_recv: int, unit: str, tool: str, matlab_ # Creare CSV in memoria output = StringIO() - writer = csv.writer(output, delimiter=";", lineterminator="\n", quoting=csv.QUOTE_MINIMAL) + writer = csv.writer(output, delimiter=",", lineterminator="\n", quoting=csv.QUOTE_MINIMAL) for row in results: writer.writerow(row) csv_data = output.getvalue()