diff options
Diffstat (limited to 'parsers/survex.py')
| -rw-r--r-- | parsers/survex.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/parsers/survex.py b/parsers/survex.py index 01f6d21..c70a80b 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -19,12 +19,12 @@ def LoadSurvexLineLeg(survexblock, stardata, sline, comment, cave): ls = sline.lower().split() ssfrom = survexblock.MakeSurvexStation(ls[stardata["from"]]) ssto = survexblock.MakeSurvexStation(ls[stardata["to"]]) - + survexleg = models.SurvexLeg(block=survexblock, stationfrom=ssfrom, stationto=ssto) if stardata["type"] == "normal": try: survexleg.tape = float(ls[stardata["tape"]]) - except ValueError: + except ValueError: print("Tape misread in", survexblock.survexfile.path) print("Stardata:", stardata) print("Line:", ls) @@ -69,7 +69,7 @@ def LoadSurvexLineLeg(survexblock, stardata, sline, comment, cave): # only save proper legs survexleg.save() - + itape = stardata.get("tape") if itape: try: @@ -106,7 +106,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): stardata = stardatadefault teammembers = [ ] - # uncomment to print out all files during parsing + # uncomment to print out all files during parsing print(" - Reading file: " + survexblock.survexfile.path) stamp = datetime.now() lineno = 0 @@ -198,7 +198,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): #print('Cave -sline ' + str(cave)) if not sline: continue - + # detect the star command mstar = regex_star.match(sline) if not mstar: @@ -214,7 +214,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): # print(' - Passage: ') #Missing "station" in stardata. continue - + # detect the star command cmd, line = mstar.groups() cmd = cmd.lower() @@ -238,7 +238,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): survexblock.save() fininclude = includesurvexfile.OpenFile() RecursiveLoad(survexblock, includesurvexfile, fininclude, textlines) - + elif re.match("begin$(?i)", cmd): if line: newsvxpath = os.path.join(os.path.split(survexfile.path)[0], re.sub(r"\.svx$", "", line)) @@ -265,7 +265,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): RecursiveLoad(survexblockdown, survexfile, fin, textlinesdown) else: iblankbegins += 1 - + elif re.match("end$(?i)", cmd): if iblankbegins: iblankbegins -= 1 @@ -277,7 +277,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): timetaken = endstamp - stamp # print(' - Time to process: ' + str(timetaken)) return - + elif re.match("date$(?i)", cmd): if len(line) == 10: #print(' - Date found: ' + line) @@ -288,7 +288,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): survexblock.expedition = expeditions[0] survexblock.expeditionday = survexblock.expedition.get_expedition_day(survexblock.date) survexblock.save() - + elif re.match("team$(?i)", cmd): pass # print(' - Team found: ') @@ -304,13 +304,13 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): if personexpedition: personrole.person=personexpedition.person personrole.save() - + elif cmd == "title": #print(' - Title found: ') survextitle = models.SurvexTitle(survexblock=survexblock, title=line.strip('"'), cave=survexfile.cave) survextitle.save() pass - + elif cmd == "require": # should we check survex version available for processing? pass @@ -329,7 +329,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): stardata = stardatadefault else: assert ls[0] == "passage", line - + elif cmd == "equate": #print(' - Equate found: ') LoadSurvexEquate(survexblock, line) |