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

to do updated

Browse Source
This commit is contained in:
Philip Sargent
2022-03-24 01:16:43 +00:00
parent be410d4d9d
commit a514355e5e
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
parsers/logbooks.py
View File

@@ -26,17 +26,14 @@ Parses and imports logbooks in all their wonderful confusion
todo=''' todo='''
- Put the object store 'trips' and the 'logdataissues' into TROG global object - Put the object store 'trips' and the 'logdataissues' into TROG global object
- works parsing logbooks but when reading cache files fails on storing data - Use the .shelve.db cache for all logbooks, not just individually
and is slower than parsing from scratch now!
- refactor everything with some urgency, esp. LoadLogbookForExpedition() - refactor everything with some urgency, esp. LoadLogbookForExpedition()
-- far too many uses of Django field dereferencing to get values, which is SLOW -- far too many uses of Django field dereferencing to get values, which is SLOW
- Logbooks log.htm exist for 1983, 84, 85, 87, 88, 89 but have no full-working parser,
or it is broken/incomplete and need hand-editing.
- Loogbooks 1987, 1988, 1989 all crash on MySql - but not sqlite - with db constraint fail - Loogbooks 1987, 1988, 1989 all crash on MySql - but not sqlite - with db constraint fail. Edit logbook to fix.
- import/parse/re-export-as-html the 'artisanal-format' old logbooks so that - import/parse/re-export-as-html the 'artisanal-format' old logbooks so that
we keep only a modern HTML05 format. Then we can retiure the old parsers and reduce the we keep only a modern HTML05 format. Then we can retiure the old parsers and reduce the
@@ -303,7 +300,7 @@ def Parseloghtmltxt(year, expedition, txt):
for trippara in tripparas: for trippara in tripparas:
logbook_entry_count += 1 logbook_entry_count += 1
tid = set_trip_id(year,logbook_entry_count) tid = set_trip_id(year,logbook_entry_count)
print(f' - new tid:{tid} lbe count: {logbook_entry_count}') # print(f' - new tid:{tid} lbe count: {logbook_entry_count}')
s = re.match(r'''(?x)(?:\s*<div\sclass="tripdate"\sid=".*?">.*?</div>\s*<p>)? # second date s = re.match(r'''(?x)(?:\s*<div\sclass="tripdate"\sid=".*?">.*?</div>\s*<p>)? # second date
\s*(?:<a\s+id="(.*?)"\s*/>\s*</a>)? \s*(?:<a\s+id="(.*?)"\s*/>\s*</a>)?