diff options
| author | Philip Sargent <philip.sargent@klebos.com> | 2020-02-20 14:13:38 +0000 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@klebos.com> | 2020-02-20 14:13:38 +0000 |
| commit | c5055e7f34e689f45605b2577799ff040f54fb51 (patch) | |
| tree | 4e332a8b8550c431cd0ee2a52f6eee0fe80a1617 | |
| parent | de14ecea222231721b4e721309acfd7492370afd (diff) | |
| download | troggle-c5055e7f34e689f45605b2577799ff040f54fb51.tar.gz troggle-c5055e7f34e689f45605b2577799ff040f54fb51.tar.bz2 troggle-c5055e7f34e689f45605b2577799ff040f54fb51.zip | |
backport order of operations in reset() and change logbook parser to do paragraphs differently
| -rw-r--r-- | databaseReset.py | 2 | ||||
| -rw-r--r-- | parsers/logbooks.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/databaseReset.py b/databaseReset.py index d3bdbc9..088c192 100644 --- a/databaseReset.py +++ b/databaseReset.py @@ -90,9 +90,9 @@ def reset(): import_caves() import_people() import_surveyscans() - import_survex() import_logbooks() import_QMs() + import_survex() try: import_tunnelfiles() except: 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"</p>", "", triptext) - ltriptext = re.sub(r"\s*?\n\s*", " ", ltriptext) - ltriptext = re.sub(r"<p>", "\n\n", ltriptext).strip() + ltriptext = re.sub(r"\s*?\n\s*", "</br>", ltriptext) + ltriptext = re.sub(r"<p>", "</br></br>", ltriptext).strip() EnterLogIntoDbase(date = ldate, place = tripcave, title = triptitle, text = ltriptext, trippeople=trippeople, expedition=expedition, logtime_underground=0, entry_type="html") |