Split reference_datetime to date and time

pull/59/head
Konstantin Gründger 2016-09-24 09:13:46 +02:00 zatwierdzone przez Fabian P. Schmidt
rodzic f047f0967c
commit 49e650916e
2 zmienionych plików z 4 dodań i 5 usunięć

Wyświetl plik

@ -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()

Wyświetl plik

@ -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