diff --git a/FtpCsvReceiver.py b/FtpCsvReceiver.py index 87f5804..856cd46 100755 --- a/FtpCsvReceiver.py +++ b/FtpCsvReceiver.py @@ -103,10 +103,10 @@ class ASEHandler(FTPHandler): lines = csvfile.readlines() unit_types = cfg.headers.keys() - unit_type = extract_value(unit_types, filename, str(lines[0:500])) - unit_name = extract_value(cfg.unit_names, filename, str(lines[0:500])) - tool_name = extract_value(cfg.tool_names, filename, str(lines[0:500])) - tool_type = extract_value(cfg.tool_types, filename, str(lines[0:500])) + unit_type = extract_value(unit_types, filename, str(lines[0:300])) + unit_name = extract_value(cfg.unit_names, filename, str(lines[0:300])) + tool_name = extract_value(cfg.tool_names, filename, str(lines[0:300])) + tool_type = extract_value(cfg.tool_types, filename, str(lines[0:300])) conn = conn_db(cfg) diff --git a/dbddl/received.sql b/dbddl/received.sql index bfbc385..47e2010 100644 --- a/dbddl/received.sql +++ b/dbddl/received.sql @@ -7,6 +7,7 @@ CREATE TABLE public.received unit_name text NULL, unit_type text NULL, tool_name text NULL, + tool_type text NULL, tool_data text NULL, status int2 DEFAULT 0 NULL, created_at timestamptz DEFAULT CURRENT_TIMESTAMP NULL, diff --git a/transform_file.py b/transform_file.py index 0cb4b01..d71e885 100644 --- a/transform_file.py +++ b/transform_file.py @@ -40,7 +40,7 @@ def elab_csv(engine, cfg): lines = file.readlines() # Estrarre le informazioni dalle prime 7 righe - if len(lines) >= cfg.header(G801): + if len(lines) >= cfg.header('G801'): tipo_centralina = lines[1].split()[0] # Prima stringa nella seconda riga nome_unit = lines[1].split()[1] # Seconda stringa nella seconda riga ip_centralina = lines[2].split()[1] # IP della centralina dalla terza riga