diff options
Diffstat (limited to 'parsers')
| -rw-r--r-- | parsers/caves.py | 8 | ||||
| -rw-r--r-- | parsers/survex.py | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/parsers/caves.py b/parsers/caves.py index 98a5463..4203368 100644 --- a/parsers/caves.py +++ b/parsers/caves.py @@ -506,7 +506,7 @@ def read_entrance(filename, ent=None): findability = getXMLmax1("findability") findability_description = getXMLmax1("findability_description") location_description = getXMLmax1("location_description") - map_description = getXMLmax1("map_description") + #map_description = getXMLmax1("map_description") marking = getXMLmax1("marking") marking_comment = getXMLmax1("marking_comment") name = getXMLmax1("name") @@ -534,7 +534,7 @@ def read_entrance(filename, ent=None): ent.findability_description=findability_description[0] ent.lastvisit=lastvisit[0] ent.location_description=location_description[0] - ent.map_description=map_description[0] + #ent.map_description=map_description[0] ent.marking=marking[0] ent.marking_comment=marking_comment[0] ent.other_description=other_description[0] @@ -741,7 +741,7 @@ def read_cave(filename, cave=None): references = getXMLmax1("references") survey = getXMLmax1("survey") kataster_status = getXMLmax1("kataster_status") - underground_centre_line = getXMLmax1("underground_centre_line") + #underground_centre_line = getXMLmax1("underground_centre_line") notes = getXMLmax1("notes") length = getXMLmax1("length") depth = getXMLmax1("depth") @@ -798,7 +798,7 @@ def read_cave(filename, cave=None): cave.references=references[0] cave.survey=survey[0] cave.kataster_status=kataster_status[0] - cave.underground_centre_line=underground_centre_line[0] + #cave.underground_centre_line=underground_centre_line[0] cave.notes=notes[0] cave.length=length[0] cave.depth=depth[0] diff --git a/parsers/survex.py b/parsers/survex.py index 3a4d42c..ead5ac8 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -617,7 +617,7 @@ class LoadingSurvex: SO we have to recognise the '*fix' too """ # *fix|36|reference|36359.40|82216.08|2000.00\n - rx_fixline = re.compile(r"(?i)^\s*[*]fix\s+([\w\d_\.\-]+)\s+(?:reference)?\s*([\d\.]*)\s+([\d\.]*)\s+([\d\.]*)\s*;(.*)$") + rx_fixline = re.compile(r"(?i)^\s*[*]fix\s+([\w\d_\.\-]+)\s+(?:reference)?\s*([\d\.]*)\s+([\d\.]*)\s+([\d\.]*)\s*;?(.*)$") line = line.replace("\n","") #fixline = self.rx_fixline.match(line) @@ -646,7 +646,6 @@ class LoadingSurvex: fixid = str(survexblock.id)+ ":"+ name self.fixes[fixid] = (survexblock, name, alt, comment) message = f"{name}, {fixdata=}, last:{fixline.groups()[-1]}" - print(self.insp + message) except Exception as e: print(f'BAD fix comment {e}', file=sys.stderr) print(f'BAD fix comment {name}, {fixdata=}\n{line.replace(" ","|")}\n{survexblock.survexfile.path}:{survexblock}', file=sys.stderr) |