diff --git a/ogn/gateway/manage.py b/ogn/gateway/manage.py index e19d48e..da21b93 100644 --- a/ogn/gateway/manage.py +++ b/ogn/gateway/manage.py @@ -54,7 +54,7 @@ def import_logfile(ogn_logfile, reference_date, logfile='main.log', loglevel='IN return try: - datetime.strptime(reference_date, "%Y-%m-%d") + reference_date = datetime.strptime(reference_date, "%Y-%m-%d") except: print('\nError in reference_date argument', reference_date) return @@ -67,7 +67,7 @@ def import_logfile(ogn_logfile, reference_date, logfile='main.log', loglevel='IN print('Start importing ogn-logfile') for line in f: - process_beacon(line, datetime.combine(datetime.strptime(reference_date, "%Y-%m-%d").date(), datetime.utcnow().time())) + process_beacon(line, reference_date=reference_date) f.close() logging.shutdown() diff --git a/ogn/gateway/process.py b/ogn/gateway/process.py index 1eb07d4..29bf3a1 100644 --- a/ogn/gateway/process.py +++ b/ogn/gateway/process.py @@ -14,12 +14,11 @@ def replace_lonlat_with_wkt(message): return message -def process_beacon(raw_message, reference_date=None): +def process_beacon(raw_message, reference_date=None, reference_time=None): if raw_message[0] == '#': return try: - message = parse_aprs(raw_message, reference_date) - + message = parse_aprs(raw_message, reference_date, reference_time) # symboltable / symbolcodes used by OGN: # I&: used as receiver # /X: helicopter_rotorcraft