diff --git a/FtpCsvReceiver.py b/FtpCsvReceiver.py index 856cd46..3a4f9ad 100755 --- a/FtpCsvReceiver.py +++ b/FtpCsvReceiver.py @@ -102,11 +102,11 @@ class ASEHandler(FTPHandler): with open(file, 'r') as csvfile: lines = csvfile.readlines() - unit_types = cfg.headers.keys() - 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])) + units_type = cfg.headers.keys() + unit_type = extract_value(units_type, filename, str(lines[0:6])) + unit_name = extract_value(cfg.units_name, filename, str(lines[0:6])) + tool_name = extract_value(cfg.tools_name, filename, str(lines[0:6])) + tool_type = extract_value(cfg.tools_type, filename, str(lines[0:6])) conn = conn_db(cfg) diff --git a/ftpcsvreceiver.ini b/ftpcsvreceiver.ini index ca8d8cd..18559ad 100644 --- a/ftpcsvreceiver.ini +++ b/ftpcsvreceiver.ini @@ -34,5 +34,5 @@ Names = ID[0-9]{4}|IX[0-9]{4} [tool] - Types = MUX|MUMS|MODB|IPTM + Types = MUX|MUMS|MODB|IPTM|MUSA Names = LOC[0-9]{4}|DT[0-9]{4} diff --git a/utils/config/set_config.py b/utils/config/set_config.py index 351a74b..e206728 100644 --- a/utils/config/set_config.py +++ b/utils/config/set_config.py @@ -39,8 +39,8 @@ class config: # unit setting self.headers = {key: int(value) for pair in c.get("unit", "Headers").split('|') for key, value in [pair.split(':')]} - self.unit_names = [part for part in c.get("unit", "Names").split('|')] + self.units_name = [part for part in c.get("unit", "Names").split('|')] # tool setting - self.tool_names = [part for part in c.get("tool", "Names").split('|')] - self.tool_types = [part for part in c.get("tool", "Types").split('|')] + self.tools_name = [part for part in c.get("tool", "Names").split('|')] + self.tools_type = [part for part in c.get("tool", "Types").split('|')]