xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Fixing logbooks with parse errors

Browse Source
This commit is contained in:
Philip Sargent
2020-02-20 15:26:33 +00:00
parent 44caf35fd8
commit 2fc60f9f74
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
databaseReset.py
View File

@@ -183,8 +183,8 @@ def usage():
surveys surveys
tunnel - read in the Tunnel files tunnel - read in the Tunnel files
writeCaves writeCaves
- read in - always means read from files and put the information into the database 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 write out - always means create the HTML files from the database
""") """)
if __name__ == "__main__": if __name__ == "__main__":

2
parsers/logbooks.py
View File

@@ -183,7 +183,7 @@ def Parseloghtmltxt(year, expedition, txt):
tripcave = "UNKNOWN" tripcave = "UNKNOWN"
#print("\n", tripcave, "--- ppp", trippeople, len(triptext)) #print("\n", tripcave, "--- ppp", trippeople, len(triptext))
ltriptext = re.sub(r"</p>", "", 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() ltriptext = re.sub(r"<p>", "</br></br>", ltriptext).strip()
EnterLogIntoDbase(date = ldate, place = tripcave, title = triptitle, text = ltriptext, EnterLogIntoDbase(date = ldate, place = tripcave, title = triptitle, text = ltriptext,
trippeople=trippeople, expedition=expedition, logtime_underground=0, trippeople=trippeople, expedition=expedition, logtime_underground=0,