From c5055e7f34e689f45605b2577799ff040f54fb51 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Thu, 20 Feb 2020 14:13:38 +0000
Subject: [PATCH] backport order of operations in reset() and change logbook
 parser to do paragraphs differently

---
 databaseReset.py    | 2 +-
 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")