From c5055e7f34e689f45605b2577799ff040f54fb51 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Thu, 20 Feb 2020 14:13:38 +0000 Subject: backport order of operations in reset() and change logbook parser to do paragraphs differently --- parsers/logbooks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'parsers/logbooks.py') diff --git a/parsers/logbooks.py b/parsers/logbooks.py index e5817a6..39e7b43 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -183,8 +183,8 @@ def Parseloghtmltxt(year, expedition, txt): tripcave = "UNKNOWN" #print("\n", tripcave, "--- ppp", trippeople, len(triptext)) ltriptext = re.sub(r"

", "", triptext) - ltriptext = re.sub(r"\s*?\n\s*", " ", ltriptext) - ltriptext = re.sub(r"

", "\n\n", ltriptext).strip() + ltriptext = re.sub(r"\s*?\n\s*", "
", ltriptext) + ltriptext = re.sub(r"

", "

", ltriptext).strip() EnterLogIntoDbase(date = ldate, place = tripcave, title = triptitle, text = ltriptext, trippeople=trippeople, expedition=expedition, logtime_underground=0, entry_type="html") -- cgit v1.2.3