From 9cd8734947766637435ee0527725af3215c98e01 Mon Sep 17 00:00:00 2001 From: Sam Wenham Date: Sun, 31 Mar 2019 15:39:53 +0100 Subject: Support html and wiki logbook entrys Move nearest_station to nearest_station_name and make nearest_station a foreign key to SurvexStation Lots of tidying --- parsers/survex.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'parsers/survex.py') diff --git a/parsers/survex.py b/parsers/survex.py index 536314f..a999c43 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -92,13 +92,13 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): teammembers = [ ] # uncomment to print out all files during parsing - print("Reading file:", survexblock.survexfile.path) + print("Reading file: " + survexblock.survexfile.path) while True: svxline = fin.readline().decode("latin1") if not svxline: return textlines.append(svxline) - + # break the line at the comment sline, comment = re.match(r"([^;]*?)\s*(?:;\s*(.*))?\n?$", svxline.strip()).groups() -- cgit v1.2.3