diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2019-03-31 15:39:53 +0100 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2019-03-31 15:39:53 +0100 |
| commit | 9df91b221b4992d29b90caa30ae5a417d5b750d0 (patch) | |
| tree | dfd69110a1af8ce3442c47f590bb129ee323a3f1 /parsers/survex.py | |
| parent | 64a4842dcbcbe10c5edb057c0000659f2809c1f9 (diff) | |
| download | troggle-9df91b221b4992d29b90caa30ae5a417d5b750d0.tar.gz troggle-9df91b221b4992d29b90caa30ae5a417d5b750d0.tar.bz2 troggle-9df91b221b4992d29b90caa30ae5a417d5b750d0.zip | |
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
Diffstat (limited to 'parsers/survex.py')
| -rw-r--r-- | parsers/survex.py | 4 |
1 files changed, 2 insertions, 2 deletions
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() |