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"
", "", 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")