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

2020-02-22 15:45:20 +00:00
parent 505bc48331 92b273e45f
commit 656ddcfe93
15 changed files with 651 additions and 107 deletions
--- a/parsers/logbooks.py
+++ b/parsers/logbooks.py
@@ -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>)?