diff options
Diffstat (limited to 'parsers')
| -rw-r--r-- | parsers/logbooks.py | 4 | ||||
| -rw-r--r-- | parsers/survex.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/parsers/logbooks.py b/parsers/logbooks.py index 2f92c8e..5bbbd98 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -32,6 +32,7 @@ def GetTripPersons(trippeople, expedition, logtime_underground): round_bracket_regex = re.compile(r"[\(\[].*?[\)\]]") for tripperson in re.split(r",|\+|&|&(?!\w+;)| and ", trippeople): tripperson = tripperson.strip() + tripperson = tripperson.strip('.') mul = re.match(r"<u>(.*?)</u>$(?i)", tripperson) if mul: tripperson = mul.group(1).strip() @@ -183,9 +184,6 @@ def Parseloghtmltxt(year, expedition, txt): continue tripid, tripid1, tripdate, trippeople, triptitle, triptext, tu = s.groups() ldate = ParseDate(tripdate.strip(), year) - #assert tripid[:-1] == "t" + tripdate, (tripid, tripdate) - #trippeople = re.sub(r"Ol(?!l)", "Olly", trippeople) - #trippeople = re.sub(r"Wook(?!e)", "Wookey", trippeople) triptitles = triptitle.split(" - ") if len(triptitles) >= 2: tripcave = triptitles[0] diff --git a/parsers/survex.py b/parsers/survex.py index d542c09..01f6d21 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -178,7 +178,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): print('QM res station %s' % qm_resolve_station) print('QM notes %s' % qm_notes) - # If the QM isn't resolved (has a resolving station) thn load it + # If the QM isn't resolved (has a resolving station) then load it if not qm_resolve_section or qm_resolve_section is not '-' or qm_resolve_section is not 'None': from_section = models.SurvexBlock.objects.filter(name=qm_from_section) # If we can find a section (survex note chunck, named) |