expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-13 22:17:07 +00:00
Code Issues 18 Projects 3 Activity

chnage img fix to import, not display

Browse Source
This commit is contained in:
Philip Sargent
2021-05-02 15:50:20 +01:00
parent a9ffae9b87
commit 51da26564f
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
parsers/logbooks.py
View File

@@ -101,7 +101,7 @@ def GetTripPersons(trippeople, expedition, logtime_underground, tid=None):
def EnterLogIntoDbase(date, place, title, text, trippeople, expedition, logtime_underground, entry_type="wiki", tid=None):
""" saves a logbook entry and related persontrips
Does NOT save the expeditionday_id - all NULLs. why?
Does NOT save the expeditionday_id - all NULLs. why? Because we are deprecating expeditionday !
"""
try:
trippersons, author = GetTripPersons(trippeople, expedition, logtime_underground, tid=tid)
@@ -127,6 +127,10 @@ def EnterLogIntoDbase(date, place, title, text, trippeople, expedition, logtime_
cave=None
if lplace not in noncaveplaces:
cave = GetCaveLookup().get(lplace)
y = str(date)[:4]
text = text.replace('src="', f'src="/years/{y}/' )
text = text.replace("src='", f"src='/years/{y}/" )
#Check for an existing copy of the current entry, and save
expeditionday = expedition.get_expedition_day(date)
@@ -134,9 +138,10 @@ def EnterLogIntoDbase(date, place, title, text, trippeople, expedition, logtime_
# 'cave' is converted to a string doing this, which renders as the cave slug.
# but it is a db query which we should try to avoid - rewrite this
#NEW slug for a logbook entry here! Use the unique id, not the title !!!
#NEW slug for a logbook entry here! Unique id + slugified title fragment
slug = tid + "_" + slugify(title)[:10].replace('-','_')
nonLookupAttribs={'place':place, 'text':text, 'expedition':expedition, 'cave_slug':str(cave), 'slug': slug, 'entry_type':entry_type}
lbo, created=save_carefully(LogbookEntry, lookupAttribs, nonLookupAttribs)