From 2fc60f9f749bb52ee8495f6702f8535b0b9e2981 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Thu, 20 Feb 2020 15:26:33 +0000
Subject: [PATCH] Fixing logbooks with parse errors
---
databaseReset.py | 4 ++--
parsers/logbooks.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/databaseReset.py b/databaseReset.py
index 9f5d288..2d35733 100644
--- a/databaseReset.py
+++ b/databaseReset.py
@@ -183,8 +183,8 @@ def usage():
surveys
tunnel - read in the Tunnel files
writeCaves
- - read in - always means read from files and put the information into the database
- - write out - always means create the auto-generated files from the database
+ read in - always means read from files and put the information into the database
+ write out - always means create the HTML files from the database
""")
if __name__ == "__main__":
diff --git a/parsers/logbooks.py b/parsers/logbooks.py
index 39e7b43..9dfa31b 100644
--- a/parsers/logbooks.py
+++ b/parsers/logbooks.py
@@ -183,7 +183,7 @@ 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*", "</br>", ltriptext)
+ ltriptext = re.sub(r"\s*?\n\s*", " ", 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,