2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-16 05:57:09 +00:00

Merge branch 'django-1.10' of ssh://expo.survex.com/~/troggle into django-1.10

This commit is contained in:
Sam Wenham
2020-02-22 15:45:20 +00:00
15 changed files with 651 additions and 107 deletions

View File

@@ -167,7 +167,7 @@ def Parseloghtmltxt(year, expedition, txt):
for trippara in tripparas:
#print(" - HR detected - maybe a trip?")
logbook_entry_count += 1
s = re.match(r'''(?x)(?:\s*<div\sclass="tripdate"\sid=".*?">.*?</div>\s*<p>)? # second date
\s*(?:<a\s+id="(.*?)"\s*/>\s*</a>)?
\s*<div\s+class="tripdate"\s*(?:id="(.*?)")?>(.*?)</div>(?:<p>)?