expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-21 23:01:52 +00:00
Code Issues 19 Projects 3 Activity

<p> now OK in logbook entries

Browse Source
This commit is contained in:
Philip Sargent 2023-11-07 23:20:59 +02:00
parent 3f94955883
commit 1ba37665b5
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/views/uploads.py
View File

@ -215,11 +215,11 @@ def logbookedit(request, year=None, slug=None):
place = request.POST["place"].strip().replace(' - ',' = ') # no hyphens !
title = request.POST["title"].strip()
entry = request.POST["text"].strip()
entry = entry.replace('\r','') # remove HTML-standard CR inserted
entry = entry.replace('\n\n','\n<br />\n<br />\n') # replace 2 \n with <br><br>
entry = entry.replace('<p>','<br />\n<br') # replace <p> tag with <br><br>
entry = entry.replace('<p ','<br />\n<br') # replace <p> tag with attributes with <br><br>
entry = entry.replace('<br>','<br />') # clean up previous hack
entry = entry.replace('\r','') # remove HTML-standard CR inserted from form.
# entry = entry.replace('\n\n','\n<br />\n<br />\n') # replace 2 \n with <br><br>
# entry = entry.replace('<p>','<br />\n<br') # replace <p> tag with <br><br>
# entry = entry.replace('<p ','<br />\n<br') # replace <p> tag with attributes with <br><br>
# entry = entry.replace('<br>','<br />') # clean up previous hack
tu = request.POST["tu"].strip()
tu = clean_tu(tu)

7
parsers/logbooks.py
View File

@ -59,7 +59,7 @@ LOGBOOK_PARSER_SETTINGS = {
LOGBOOKS_DIR = "years" # subfolder of settings.EXPOWEB
ENTRIES = {
"2023": 83,
"2023": 84,
"2022": 94,
"2019": 55,
"2018": 95,
@ -408,8 +408,9 @@ def parser_html(year, expedition, txt, seq=""):
place = triptitles[0]
else:
place = "Unknown"
tripcontent = re.sub(r"</p>", "", triptext)
tripcontent = re.sub(r"<p>", "<br /><br />", tripcontent).strip()
# tripcontent = re.sub(r"</p>", "", triptext)
# tripcontent = re.sub(r"<p>", "<br /><br />", tripcontent).strip()
tripcontent = triptext.strip()
triptitle = triptitle.strip()
# triptitle must be unique for a given date. [Why?!] We fix this here.