Changed to regex to make 2003 expo logbooks parse

This commit is contained in:
Martin Green 2011-07-10 23:45:45 +01:00
parent 514169ec58
commit e8eb877229

View File

@ -146,7 +146,7 @@ def Parseloghtmltxt(year, expedition, txt):
for trippara in tripparas:
s = re.match('''(?x)(?:\s*<div\sclass="tripdate"\sid=".*?">.*?</div>\s*<p>)? # second date
\s*(?:<a\s+id="(.*?)"\s*/>)?
\s*(?:<a\s+id="(.*?)"\s*/>\s*</a>)?
\s*<div\s+class="tripdate"\s*(?:id="(.*?)")?>(.*?)</div>(?:<p>)?
\s*<div\s+class="trippeople">\s*(.*?)</div>
\s*<div\s+class="triptitle">\s*(.*?)</div>