2011-07-11 02:10:22 +01:00
|
|
|
import csv
|
|
|
|
import os
|
2020-05-28 02:20:50 +01:00
|
|
|
import re
|
2022-11-23 00:36:44 +00:00
|
|
|
# import pickle
|
|
|
|
# import shelve
|
2021-11-11 20:57:49 +00:00
|
|
|
import time
|
|
|
|
from random import randint
|
|
|
|
from datetime import datetime, date
|
|
|
|
from pathlib import Path
|
2011-07-11 02:10:22 +01:00
|
|
|
|
2020-05-28 02:20:50 +01:00
|
|
|
from django.conf import settings
|
|
|
|
from django.template.defaultfilters import slugify
|
|
|
|
from django.utils.timezone import get_current_timezone, make_aware
|
|
|
|
|
2021-04-13 00:43:57 +01:00
|
|
|
from troggle.core.models.troggle import DataIssue, Expedition
|
2021-04-13 00:11:08 +01:00
|
|
|
from troggle.core.utils import TROG, save_carefully
|
2021-04-13 00:47:17 +01:00
|
|
|
from troggle.core.models.caves import Cave, LogbookEntry, PersonTrip, GetCaveLookup
|
2020-05-28 02:20:50 +01:00
|
|
|
from parsers.people import GetPersonExpeditionNameLookup
|
2011-07-11 02:10:22 +01:00
|
|
|
|
2021-04-13 01:37:42 +01:00
|
|
|
'''
|
|
|
|
Parses and imports logbooks in all their wonderful confusion
|
|
|
|
|
2011-07-11 02:10:22 +01:00
|
|
|
# When we edit logbook entries, allow a "?" after any piece of data to say we've frigged it and
|
|
|
|
# it can be checked up later from the hard-copy if necessary; or it's not possible to determin (name, trip place, etc)
|
2021-04-13 01:37:42 +01:00
|
|
|
'''
|
2021-04-23 03:07:21 +01:00
|
|
|
todo='''
|
|
|
|
- refactor everything with some urgency, esp. LoadLogbookForExpedition()
|
|
|
|
|
2022-08-30 15:58:49 +01:00
|
|
|
- profile the code to find bad repetitive things, of which there are many.
|
|
|
|
|
|
|
|
- far too many uses of Django field dereferencing to get values, which is SLOW
|
2022-03-24 01:05:50 +00:00
|
|
|
|
2022-08-30 15:58:49 +01:00
|
|
|
- Logbooks 1987, 1988, 1989 all crash on MySql - but not sqlite - with db constraint fail. Edit logbook to fix.
|
2021-11-05 21:01:10 +00:00
|
|
|
|
2021-04-23 03:07:21 +01:00
|
|
|
- import/parse/re-export-as-html the 'artisanal-format' old logbooks so that
|
2022-08-30 15:58:49 +01:00
|
|
|
we keep only a modern HTML05 format. Then we can retire the old parsers and reduce the
|
2021-04-23 03:07:21 +01:00
|
|
|
volume of code here substantially.
|
|
|
|
|
|
|
|
- rewrite to use generators rather than storing everything intermediate in lists - to reduce memory impact.
|
|
|
|
|
|
|
|
- We should ensure logbook.html is utf-8 and stop this crap:
|
|
|
|
file_in = open(logbookfile,'rb')
|
|
|
|
txt = file_in.read().decode("latin1")
|
2021-04-23 16:11:50 +01:00
|
|
|
|
|
|
|
- this is a slow and uncertain function: cave = getCaveByReference(caveRef)
|
2022-08-30 15:58:49 +01:00
|
|
|
|
2021-04-23 03:07:21 +01:00
|
|
|
'''
|
2022-11-21 16:41:52 +00:00
|
|
|
MAX_LOGBOOK_ENTRY_TITLE_LENGTH = 200
|
2022-11-21 16:47:25 +00:00
|
|
|
DEFAULT_LOGBOOK_PARSER = "parser_html"
|
2022-11-21 16:41:52 +00:00
|
|
|
DEFAULT_LOGBOOK_FILE = "logbook.html"
|
|
|
|
# All years since 2010 use the default value for Logbook parser
|
|
|
|
# but several don't work, and are skipped by the parsing code, e.g. 1983
|
|
|
|
LOGBOOK_PARSER_SETTINGS = {
|
2022-11-21 16:47:25 +00:00
|
|
|
"2010": ("logbook.html", "parser_html"),
|
|
|
|
"2009": ("2009logbook.txt", "parser_wiki"),
|
|
|
|
"2008": ("2008logbook.txt", "parser_wiki"),
|
|
|
|
"2007": ("logbook.html", "parser_html"),
|
|
|
|
"2006": ("logbook.html", "parser_html"),
|
|
|
|
# "2006": ("logbook/logbook_06.txt", "parser_wiki"),
|
|
|
|
"2006": ("logbook.html", "parser_html"),
|
|
|
|
"2005": ("logbook.html", "parser_html"),
|
|
|
|
"2004": ("logbook.html", "parser_html"),
|
|
|
|
"2003": ("logbook.html", "parser_html_03"),
|
|
|
|
"2002": ("logbook.html", "parser_html"),
|
|
|
|
"2001": ("log.htm", "parser_html_01"),
|
|
|
|
"2000": ("log.htm", "parser_html_01"),
|
|
|
|
"1999": ("log.htm", "parser_html_01"),
|
|
|
|
"1998": ("log.htm", "parser_html_01"),
|
|
|
|
"1997": ("log.htm", "parser_html_01"),
|
|
|
|
"1996": ("log.htm", "parser_html_01"),
|
|
|
|
"1995": ("log.htm", "parser_html_01"),
|
|
|
|
"1994": ("log.htm", "parser_html_01"),
|
|
|
|
"1993": ("log.htm", "parser_html_01"),
|
|
|
|
"1992": ("log.htm", "parser_html_01"),
|
|
|
|
"1991": ("log.htm", "parser_html_01"),
|
|
|
|
"1990": ("log.htm", "parser_html_01"),
|
|
|
|
"1989": ("log.htm", "parser_html_01"), #crashes MySQL
|
|
|
|
"1988": ("log.htm", "parser_html_01"), #crashes MySQL
|
|
|
|
"1987": ("log.htm", "parser_html_01"), #crashes MySQL
|
|
|
|
"1985": ("log.htm", "parser_html_01"),
|
|
|
|
"1984": ("log.htm", "parser_html_01"),
|
|
|
|
"1983": ("log.htm", "parser_html_01"),
|
|
|
|
"1982": ("log.htm", "parser_html_01"),
|
2022-11-21 16:41:52 +00:00
|
|
|
}
|
2021-04-23 03:07:21 +01:00
|
|
|
|
2022-11-23 00:49:47 +00:00
|
|
|
entries = { "2022": 64, "2019": 55, "2018": 74, "2017": 60, "2016": 81, "2015": 79,
|
2022-03-24 01:05:50 +00:00
|
|
|
"2014": 65, "2013": 51, "2012": 75, "2011": 68, "2010": 22, "2009": 52,
|
|
|
|
"2008": 49, "2007": 111, "2006": 60, "2005": 55, "2004": 76, "2003": 40, "2002": 31,
|
|
|
|
"2001": 48, "2000": 54, "1999": 79, "1998": 43, "1997": 53, "1996": 94, "1995": 41,
|
|
|
|
"1994": 32, "1993": 41, "1992": 61, "1991": 38, "1990": 87, "1989": 1,"1988": 1,"1987": 1,
|
|
|
|
"1985": 24,"1984": 32,"1983": 52,"1982": 42,}
|
|
|
|
# Logbooks log.htm exist for 1983, 84, 85, 87, 88, 89 but have no full-working parser, or need hand-editing.
|
|
|
|
|
2022-11-21 16:41:52 +00:00
|
|
|
logentries = [] # the entire logbook for one year is a single object: a list of entries
|
|
|
|
noncaveplaces = [ "QMplaceholder", "Journey", "Loser Plateau", "UNKNOWN", 'plateau',
|
|
|
|
'base camp', 'basecamp', 'top camp', 'topcamp' ]
|
|
|
|
logdataissues = TROG['issues']['logdataissues']
|
|
|
|
trips ={}
|
2011-07-11 02:10:22 +01:00
|
|
|
|
|
|
|
#
|
|
|
|
# the logbook loading section
|
|
|
|
#
|
2021-04-23 16:11:50 +01:00
|
|
|
def set_trip_id(year, seq):
|
2021-05-02 14:50:46 +01:00
|
|
|
tid= f"{year}_s{seq:02d}"
|
2021-04-23 16:11:50 +01:00
|
|
|
return tid
|
|
|
|
|
2022-11-18 20:42:03 +00:00
|
|
|
rx_tripperson = re.compile(r'(?i)<u>(.*?)</u>$')
|
|
|
|
rx_round_bracket = re.compile(r"[\(\[].*?[\)\]]")
|
|
|
|
|
2021-04-23 16:11:50 +01:00
|
|
|
|
|
|
|
def GetTripPersons(trippeople, expedition, logtime_underground, tid=None):
|
2011-07-11 02:10:22 +01:00
|
|
|
res = [ ]
|
|
|
|
author = None
|
2021-04-23 16:11:50 +01:00
|
|
|
#print(f'# {tid}')
|
|
|
|
|
2019-03-06 23:20:34 +00:00
|
|
|
for tripperson in re.split(r",|\+|&|&(?!\w+;)| and ", trippeople):
|
2011-07-11 02:10:22 +01:00
|
|
|
tripperson = tripperson.strip()
|
2022-11-18 20:42:03 +00:00
|
|
|
# mul = re.match(r"(?i)<u>(.*?)</u>$", tripperson)
|
|
|
|
mul = rx_tripperson.match(tripperson)
|
2011-07-11 02:10:22 +01:00
|
|
|
if mul:
|
|
|
|
tripperson = mul.group(1).strip()
|
|
|
|
if tripperson and tripperson[0] != '*':
|
2022-11-18 20:42:03 +00:00
|
|
|
tripperson = re.sub(rx_round_bracket, "", tripperson).strip()
|
2021-04-24 01:23:55 +01:00
|
|
|
|
|
|
|
if tripperson =="Wiggy":
|
|
|
|
tripperson = "Phil Wigglesworth"
|
|
|
|
if tripperson =="Animal":
|
|
|
|
tripperson = "Mike Richardson"
|
2022-10-07 21:47:05 +01:00
|
|
|
if tripperson =="MikeTA":
|
|
|
|
tripperson = "Mike Richardson"
|
2021-04-24 01:23:55 +01:00
|
|
|
|
|
|
|
|
2011-07-11 02:10:22 +01:00
|
|
|
personyear = GetPersonExpeditionNameLookup(expedition).get(tripperson.lower())
|
|
|
|
if not personyear:
|
2022-08-30 15:58:49 +01:00
|
|
|
message = f" ! - {expedition.year} No name match for: '{tripperson}' in entry {tid=} for this expedition year."
|
2021-02-06 00:18:48 +00:00
|
|
|
print(message)
|
2020-05-30 12:35:15 +01:00
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
2021-04-23 11:43:25 +01:00
|
|
|
logdataissues[tid]=message
|
2011-07-11 02:10:22 +01:00
|
|
|
res.append((personyear, logtime_underground))
|
|
|
|
if mul:
|
|
|
|
author = personyear
|
|
|
|
if not author:
|
|
|
|
if not res:
|
|
|
|
return None, None
|
|
|
|
author = res[-1][0]
|
2021-04-24 01:23:55 +01:00
|
|
|
|
2011-07-11 02:10:22 +01:00
|
|
|
return res, author
|
|
|
|
|
2022-08-30 15:58:49 +01:00
|
|
|
def EnterLogIntoDbase(date, place, title, text, trippeople, expedition, logtime_underground, tid=None):
|
2020-06-19 16:39:05 +01:00
|
|
|
""" saves a logbook entry and related persontrips
|
2021-05-02 15:50:20 +01:00
|
|
|
Does NOT save the expeditionday_id - all NULLs. why? Because we are deprecating expeditionday !
|
2022-03-23 22:55:59 +00:00
|
|
|
|
|
|
|
troggle.log shows that we are creating lots of duplicates, which is no no problem with SQL as they just overwrite
|
2022-11-21 16:26:30 +00:00
|
|
|
but we are saving the same thing too many times..
|
2020-06-19 16:39:05 +01:00
|
|
|
"""
|
2021-04-23 11:43:25 +01:00
|
|
|
try:
|
|
|
|
trippersons, author = GetTripPersons(trippeople, expedition, logtime_underground, tid=tid)
|
|
|
|
except:
|
2021-04-23 16:11:50 +01:00
|
|
|
message = f" ! - {expedition.year} Skipping logentry: {title} - GetTripPersons FAIL"
|
2021-04-23 11:43:25 +01:00
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
|
|
|
logdataissues["title"]=message
|
2021-04-23 16:11:50 +01:00
|
|
|
print(message)
|
2022-11-18 20:42:03 +00:00
|
|
|
raise
|
2021-04-23 11:43:25 +01:00
|
|
|
return
|
|
|
|
|
2011-07-11 02:10:22 +01:00
|
|
|
if not author:
|
2022-08-30 15:58:49 +01:00
|
|
|
message = f" ! - {expedition.year} Warning: logentry: {title} - no author for entry '{tid}'"
|
2020-05-30 12:35:15 +01:00
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
2021-02-06 00:18:48 +00:00
|
|
|
logdataissues["title"]=message
|
2021-04-23 16:11:50 +01:00
|
|
|
print(message)
|
2021-04-24 01:23:55 +01:00
|
|
|
#return
|
2019-03-31 15:39:53 +01:00
|
|
|
|
2020-06-19 16:39:05 +01:00
|
|
|
# This needs attention. The slug field is derived from 'title'
|
|
|
|
# both GetCaveLookup() and GetTripCave() need to work together better. None of this data is *used* though?
|
|
|
|
#tripCave = GetTripCave(place):
|
2019-03-31 15:39:53 +01:00
|
|
|
|
2011-07-11 02:10:22 +01:00
|
|
|
lplace = place.lower()
|
2020-06-19 16:39:05 +01:00
|
|
|
cave=None
|
2011-07-11 02:10:22 +01:00
|
|
|
if lplace not in noncaveplaces:
|
2020-06-19 16:39:05 +01:00
|
|
|
cave = GetCaveLookup().get(lplace)
|
2021-05-02 15:50:20 +01:00
|
|
|
|
|
|
|
y = str(date)[:4]
|
|
|
|
text = text.replace('src="', f'src="/years/{y}/' )
|
|
|
|
text = text.replace("src='", f"src='/years/{y}/" )
|
2011-07-11 02:10:22 +01:00
|
|
|
|
|
|
|
#Check for an existing copy of the current entry, and save
|
|
|
|
expeditionday = expedition.get_expedition_day(date)
|
2019-03-31 15:39:53 +01:00
|
|
|
lookupAttribs={'date':date, 'title':title}
|
2020-06-19 16:39:05 +01:00
|
|
|
# 'cave' is converted to a string doing this, which renders as the cave slug.
|
2020-07-01 22:49:38 +01:00
|
|
|
# but it is a db query which we should try to avoid - rewrite this
|
2021-04-23 16:11:50 +01:00
|
|
|
|
2021-05-02 15:50:20 +01:00
|
|
|
#NEW slug for a logbook entry here! Unique id + slugified title fragment
|
2022-11-23 00:36:44 +00:00
|
|
|
|
2021-11-11 20:57:49 +00:00
|
|
|
if tid is not None:
|
|
|
|
slug = tid + "_" + slugify(title)[:10].replace('-','_')
|
|
|
|
else:
|
|
|
|
slug = str(randint(1000,10000)) + "_" + slugify(title)[:10].replace('-','_')
|
2022-08-30 15:58:49 +01:00
|
|
|
nonLookupAttribs={'place':place, 'text':text, 'expedition':expedition, 'cave_slug':str(cave), 'slug': slug}
|
2021-05-02 15:50:20 +01:00
|
|
|
|
2022-08-30 15:58:49 +01:00
|
|
|
# This creates the lbo instance of LogbookEntry
|
2020-05-30 12:35:15 +01:00
|
|
|
lbo, created=save_carefully(LogbookEntry, lookupAttribs, nonLookupAttribs)
|
2020-04-12 22:29:30 +01:00
|
|
|
|
2011-07-11 02:10:22 +01:00
|
|
|
|
|
|
|
for tripperson, time_underground in trippersons:
|
|
|
|
lookupAttribs={'personexpedition':tripperson, 'logbook_entry':lbo}
|
|
|
|
nonLookupAttribs={'time_underground':time_underground, 'is_logbook_entry_author':(tripperson == author)}
|
2022-03-23 22:55:59 +00:00
|
|
|
# this creates the PersonTrip instance.
|
2022-11-21 16:41:52 +00:00
|
|
|
save_carefully(PersonTrip, lookupAttribs, nonLookupAttribs)
|
2011-07-11 02:10:22 +01:00
|
|
|
|
|
|
|
def ParseDate(tripdate, year):
|
|
|
|
""" Interprets dates in the expo logbooks and returns a correct datetime.date object """
|
2022-07-15 13:11:49 +01:00
|
|
|
dummydate = date(1970, 1, 1)
|
2022-08-25 13:54:00 +01:00
|
|
|
month = 1
|
|
|
|
day = 1
|
2022-09-21 22:22:09 +01:00
|
|
|
# message = f" ! - Trying to parse date in logbook: {tripdate} - {year}"
|
|
|
|
# print(message)
|
2021-04-23 16:11:50 +01:00
|
|
|
try:
|
|
|
|
mdatestandard = re.match(r"(\d\d\d\d)-(\d\d)-(\d\d)", tripdate)
|
|
|
|
mdategoof = re.match(r"(\d\d?)/0?(\d)/(20|19)?(\d\d)", tripdate)
|
|
|
|
if mdatestandard:
|
|
|
|
if not (mdatestandard.group(1) == year):
|
2022-07-08 23:30:49 +01:00
|
|
|
message = f" ! - Bad date (year) in logbook: {tripdate} - {year}"
|
2021-04-23 16:11:50 +01:00
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
|
|
|
logdataissues["tripdate"]=message
|
2022-07-15 13:11:49 +01:00
|
|
|
return dummydate
|
2021-04-23 16:11:50 +01:00
|
|
|
else:
|
|
|
|
year, month, day = int(mdatestandard.group(1)), int(mdatestandard.group(2)), int(mdatestandard.group(3))
|
|
|
|
elif mdategoof:
|
|
|
|
if not (not mdategoof.group(3) or mdategoof.group(3) == year[:2]):
|
|
|
|
message = " ! - Bad date mdategoof.group(3) in logbook: " + tripdate + " - " + mdategoof.group(3)
|
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
|
|
|
logdataissues["tripdate"]=message
|
2022-07-15 13:11:49 +01:00
|
|
|
return dummydate
|
2021-04-23 16:11:50 +01:00
|
|
|
else:
|
|
|
|
yadd = int(year[:2]) * 100
|
|
|
|
day, month, year = int(mdategoof.group(1)), int(mdategoof.group(2)), int(mdategoof.group(4)) + yadd
|
2021-03-29 02:06:19 +01:00
|
|
|
else:
|
2022-08-25 13:54:00 +01:00
|
|
|
year = 1970
|
2022-07-08 23:30:49 +01:00
|
|
|
message = f" ! - Bad date in logbook: {tripdate} - {year}"
|
2021-03-29 02:06:19 +01:00
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
|
|
|
logdataissues["tripdate"]=message
|
2021-04-23 16:11:50 +01:00
|
|
|
|
|
|
|
return date(year, month, day)
|
|
|
|
except:
|
2022-07-08 23:30:49 +01:00
|
|
|
message = f" ! - Failed to parse date in logbook: {tripdate} - {year}"
|
2020-07-06 21:46:58 +01:00
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
2021-02-06 00:18:48 +00:00
|
|
|
logdataissues["tripdate"]=message
|
2022-07-08 23:55:11 +01:00
|
|
|
return datetime.date(1970, 1, 1)
|
2011-07-11 02:10:22 +01:00
|
|
|
|
2020-07-07 19:07:45 +01:00
|
|
|
# (2006 - not any more), 2008 - 2009
|
2022-11-21 16:47:25 +00:00
|
|
|
def parser_wiki(year, expedition, txt):
|
2020-06-08 21:33:32 +01:00
|
|
|
global logentries
|
|
|
|
global logdataissues
|
|
|
|
|
|
|
|
logbook_entry_count = 0
|
2019-03-06 23:20:34 +00:00
|
|
|
trippara = re.findall(r"===(.*?)===([\s\S]*?)(?====)", txt)
|
2011-07-11 02:10:22 +01:00
|
|
|
for triphead, triptext in trippara:
|
2020-06-08 21:33:32 +01:00
|
|
|
logbook_entry_count += 1
|
2021-04-23 16:11:50 +01:00
|
|
|
tid = set_trip_id(year,logbook_entry_count)
|
|
|
|
|
2011-07-11 02:10:22 +01:00
|
|
|
tripheadp = triphead.split("|")
|
2021-03-29 02:06:19 +01:00
|
|
|
if not (len(tripheadp) == 3):
|
|
|
|
message = " ! - Bad no of items in tripdate in logbook: " + tripdate + " - " + tripheadp
|
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
|
|
|
logdataissues["tripdate"]=message
|
|
|
|
|
2011-07-11 02:10:22 +01:00
|
|
|
tripdate, tripplace, trippeople = tripheadp
|
|
|
|
tripsplace = tripplace.split(" - ")
|
|
|
|
tripcave = tripsplace[0].strip()
|
2021-04-13 22:27:01 +01:00
|
|
|
if len(tripsplace) == 1:
|
|
|
|
tripsplace = tripsplace[0]
|
|
|
|
else:
|
|
|
|
tripsplace = tripsplace[1]
|
|
|
|
|
2021-04-14 00:12:27 +01:00
|
|
|
#print(f"! LOGBOOK {year} {logbook_entry_count:2} {len(triptext):4} '{tripsplace}'")
|
2011-07-11 02:10:22 +01:00
|
|
|
|
2019-03-06 23:20:34 +00:00
|
|
|
tul = re.findall(r"T/?U:?\s*(\d+(?:\.\d*)?|unknown)\s*(hrs|hours)?", triptext)
|
2011-07-11 02:10:22 +01:00
|
|
|
if tul:
|
|
|
|
tu = tul[0][0]
|
|
|
|
else:
|
|
|
|
tu = ""
|
|
|
|
|
|
|
|
ldate = ParseDate(tripdate.strip(), year)
|
2020-06-08 21:33:32 +01:00
|
|
|
tripid =""
|
|
|
|
|
|
|
|
entrytuple = (ldate, tripcave, tripsplace, triptext,
|
2022-11-23 00:36:44 +00:00
|
|
|
trippeople, expedition, tu, tripid)
|
2020-06-08 21:33:32 +01:00
|
|
|
logentries.append(entrytuple)
|
|
|
|
|
2022-11-21 00:04:33 +00:00
|
|
|
|
2020-05-30 20:31:20 +01:00
|
|
|
# 2002, 2004, 2005, 2007, 2010 - now
|
2020-07-07 19:07:45 +01:00
|
|
|
# 2006 wiki text is incomplete, but the html all there. So using this parser now.
|
2022-11-21 16:47:25 +00:00
|
|
|
def parser_html(year, expedition, txt):
|
2020-06-08 21:33:32 +01:00
|
|
|
global logentries
|
|
|
|
global logdataissues
|
|
|
|
|
2019-03-06 23:20:34 +00:00
|
|
|
tripparas = re.findall(r"<hr\s*/>([\s\S]*?)(?=<hr)", txt)
|
|
|
|
logbook_entry_count = 0
|
2011-07-11 02:10:22 +01:00
|
|
|
for trippara in tripparas:
|
2019-03-06 23:20:34 +00:00
|
|
|
logbook_entry_count += 1
|
2021-04-23 16:11:50 +01:00
|
|
|
tid = set_trip_id(year,logbook_entry_count)
|
2022-03-24 01:16:43 +00:00
|
|
|
# print(f' - new tid:{tid} lbe count: {logbook_entry_count}')
|
2021-04-23 11:43:25 +01:00
|
|
|
|
2019-03-06 23:20:34 +00:00
|
|
|
s = re.match(r'''(?x)(?:\s*<div\sclass="tripdate"\sid=".*?">.*?</div>\s*<p>)? # second date
|
2011-07-11 02:10:22 +01:00
|
|
|
\s*(?:<a\s+id="(.*?)"\s*/>\s*</a>)?
|
|
|
|
\s*<div\s+class="tripdate"\s*(?:id="(.*?)")?>(.*?)</div>(?:<p>)?
|
|
|
|
\s*<div\s+class="trippeople">\s*(.*?)</div>
|
|
|
|
\s*<div\s+class="triptitle">\s*(.*?)</div>
|
|
|
|
([\s\S]*?)
|
|
|
|
\s*(?:<div\s+class="timeug">\s*(.*?)</div>)?
|
|
|
|
\s*$
|
|
|
|
''', trippara)
|
2022-08-25 14:12:13 +01:00
|
|
|
if s:
|
|
|
|
tripid, tripid1, tripdate, trippeople, triptitle, triptext, tu = s.groups()
|
|
|
|
else: # allow title and people to be swapped in order
|
|
|
|
s2 = re.match(r'''(?x)(?:\s*<div\sclass="tripdate"\sid=".*?">.*?</div>\s*<p>)? # second date
|
2022-08-25 13:54:00 +01:00
|
|
|
\s*(?:<a\s+id="(.*?)"\s*/>\s*</a>)?
|
|
|
|
\s*<div\s+class="tripdate"\s*(?:id="(.*?)")?>(.*?)</div>(?:<p>)?
|
|
|
|
\s*<div\s+class="triptitle">\s*(.*?)</div>
|
|
|
|
\s*<div\s+class="trippeople">\s*(.*?)</div>
|
|
|
|
([\s\S]*?)
|
|
|
|
\s*(?:<div\s+class="timeug">\s*(.*?)</div>)?
|
|
|
|
\s*$
|
|
|
|
''', trippara)
|
2022-08-25 14:12:13 +01:00
|
|
|
if s2:
|
|
|
|
tripid, tripid1, tripdate, triptitle, trippeople, triptext, tu = s2.groups()
|
|
|
|
else:
|
|
|
|
if not re.search(r"Rigging Guide", trippara):
|
2022-11-23 00:49:47 +00:00
|
|
|
msg = f" !- Logbook. Can't parse {tripid1}: {trippara} entry:{logbook_entry_count} "
|
2022-08-25 14:12:13 +01:00
|
|
|
print(msg)
|
|
|
|
DataIssue.objects.create(parser='logbooks', message=msg)
|
|
|
|
logdataissues[tid]=msg
|
|
|
|
continue
|
2022-08-25 13:54:00 +01:00
|
|
|
|
2011-07-11 02:10:22 +01:00
|
|
|
ldate = ParseDate(tripdate.strip(), year)
|
|
|
|
triptitles = triptitle.split(" - ")
|
|
|
|
if len(triptitles) >= 2:
|
|
|
|
tripcave = triptitles[0]
|
|
|
|
else:
|
|
|
|
tripcave = "UNKNOWN"
|
2019-03-06 23:20:34 +00:00
|
|
|
ltriptext = re.sub(r"</p>", "", triptext)
|
2020-02-20 15:26:33 +00:00
|
|
|
ltriptext = re.sub(r"\s*?\n\s*", " ", ltriptext)
|
2020-02-20 14:13:38 +00:00
|
|
|
ltriptext = re.sub(r"<p>", "</br></br>", ltriptext).strip()
|
2020-06-08 21:33:32 +01:00
|
|
|
|
|
|
|
entrytuple = (ldate, tripcave, triptitle, ltriptext,
|
2022-11-23 00:36:44 +00:00
|
|
|
trippeople, expedition, tu, tripid1)
|
2020-06-08 21:33:32 +01:00
|
|
|
logentries.append(entrytuple)
|
|
|
|
|
|
|
|
|
2019-03-30 13:58:38 +00:00
|
|
|
# main parser for 1991 - 2001. simpler because the data has been hacked so much to fit it
|
2021-04-24 01:23:55 +01:00
|
|
|
# trying it out for years 1982 - 1990 too. Some logbook editing required by hand.. place
|
2022-11-21 16:47:25 +00:00
|
|
|
def parser_html_01(year, expedition, txt):
|
2020-06-08 21:33:32 +01:00
|
|
|
global logentries
|
|
|
|
global logdataissues
|
2021-02-06 00:18:48 +00:00
|
|
|
errorcount = 0
|
2020-06-08 21:33:32 +01:00
|
|
|
|
2019-03-06 23:20:34 +00:00
|
|
|
tripparas = re.findall(r"<hr[\s/]*>([\s\S]*?)(?=<hr)", txt)
|
2020-06-08 21:33:32 +01:00
|
|
|
logbook_entry_count = 0
|
2011-07-11 02:10:22 +01:00
|
|
|
for trippara in tripparas:
|
2020-06-08 21:33:32 +01:00
|
|
|
logbook_entry_count += 1
|
2021-04-23 16:11:50 +01:00
|
|
|
tid = set_trip_id(year,logbook_entry_count)
|
2021-04-24 01:23:55 +01:00
|
|
|
# print(f" #0 - tid: {tid}")
|
2021-02-06 00:18:48 +00:00
|
|
|
try:
|
2021-04-24 01:23:55 +01:00
|
|
|
#print(f" #1 - tid: {tid}")
|
2021-04-13 00:18:30 +01:00
|
|
|
s = re.match(r"(?s)\s*(?:<p>)?(.*?)</?p>(.*)$(?i)", trippara)
|
2021-02-06 00:18:48 +00:00
|
|
|
if not s:
|
2021-04-23 16:11:50 +01:00
|
|
|
message = " ! - Skipping logentry {year} failure to parse header: " + tid + trippara[:300] + "..."
|
2021-02-06 00:18:48 +00:00
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
2021-04-23 11:43:25 +01:00
|
|
|
logdataissues[tid]=message
|
2021-02-06 00:18:48 +00:00
|
|
|
print(message)
|
|
|
|
break
|
2021-04-24 01:23:55 +01:00
|
|
|
try:
|
|
|
|
tripheader, triptext = s.group(1), s.group(2)
|
|
|
|
except:
|
|
|
|
message = f" ! - Fail to set tripheader, triptext. trip:<{tid}> s:'{s}'"
|
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
|
|
|
logdataissues[tid]=message
|
|
|
|
print(message)
|
|
|
|
|
|
|
|
|
|
|
|
# mtripid = re.search(r'<a id="(.*?)"', tripheader)
|
2021-04-23 16:11:50 +01:00
|
|
|
# if not mtripid:
|
2021-04-24 01:23:55 +01:00
|
|
|
# message = f" ! - A tag id not found. Never mind. Not needed. trip:<{tid}> header:'{tripheader}'"
|
2021-04-23 16:11:50 +01:00
|
|
|
# DataIssue.objects.create(parser='logbooks', message=message)
|
|
|
|
# logdataissues[tid]=message
|
|
|
|
# print(message)
|
|
|
|
|
2021-04-24 01:23:55 +01:00
|
|
|
# tripid = mtripid and mtripid.group(1) or ""
|
|
|
|
# print(f" # - mtripid: {mtripid}")
|
2021-02-06 00:18:48 +00:00
|
|
|
tripheader = re.sub(r"</?(?:[ab]|span)[^>]*>", "", tripheader)
|
2021-04-24 01:23:55 +01:00
|
|
|
#print(f" #2 - tid: {tid}")
|
|
|
|
try:
|
|
|
|
tripdate, triptitle, trippeople = tripheader.split("|")
|
|
|
|
except:
|
2021-05-09 00:55:37 +01:00
|
|
|
message = f" ! - Fail 3 to split out date|title|people. trip:<{tid}> '{tripheader.split('|')}'"
|
2021-04-24 01:23:55 +01:00
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
|
|
|
logdataissues[tid]=message
|
|
|
|
print(message)
|
2021-05-09 00:55:37 +01:00
|
|
|
try:
|
|
|
|
tripdate, triptitle = tripheader.split("|")
|
|
|
|
trippeople = "GUESS ANON"
|
|
|
|
except:
|
|
|
|
message = f" ! - Skipping logentry {year} Fail 2 to split out date|title (anon). trip:<{tid}> '{tripheader.split('|')}' CRASHES MySQL !"
|
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
|
|
|
logdataissues[tid]=message
|
|
|
|
print(message)
|
|
|
|
break
|
2021-04-24 01:23:55 +01:00
|
|
|
#print(f" #3 - tid: {tid}")
|
2021-02-06 00:18:48 +00:00
|
|
|
ldate = ParseDate(tripdate.strip(), year)
|
2021-04-24 01:23:55 +01:00
|
|
|
#print(f" # - tid: {tid} <{tripdate}> <{triptitle}> <{trippeople}>")
|
|
|
|
#print(f" #4 - tid: {tid}")
|
|
|
|
|
2021-02-06 00:18:48 +00:00
|
|
|
mtu = re.search(r'<p[^>]*>(T/?U.*)', triptext)
|
|
|
|
if mtu:
|
|
|
|
tu = mtu.group(1)
|
|
|
|
triptext = triptext[:mtu.start(0)] + triptext[mtu.end():]
|
|
|
|
else:
|
|
|
|
tu = ""
|
|
|
|
|
|
|
|
triptitles = triptitle.split(" - ")
|
|
|
|
tripcave = triptitles[0].strip()
|
|
|
|
|
|
|
|
ltriptext = triptext
|
|
|
|
|
|
|
|
mtail = re.search(r'(?:<a href="[^"]*">[^<]*</a>|\s|/|-|&|</?p>|\((?:same day|\d+)\))*$', ltriptext)
|
|
|
|
if mtail:
|
|
|
|
ltriptext = ltriptext[:mtail.start(0)]
|
|
|
|
ltriptext = re.sub(r"</p>", "", ltriptext)
|
|
|
|
ltriptext = re.sub(r"\s*?\n\s*", " ", ltriptext)
|
|
|
|
ltriptext = re.sub(r"<p>|<br>", "\n\n", ltriptext).strip()
|
|
|
|
ltriptext = re.sub(r"</?u>", "_", ltriptext)
|
|
|
|
ltriptext = re.sub(r"</?i>", "''", ltriptext)
|
|
|
|
ltriptext = re.sub(r"</?b>", "'''", ltriptext)
|
2021-04-23 16:11:50 +01:00
|
|
|
|
|
|
|
if ltriptext == "":
|
|
|
|
message = " ! - Zero content for logbook entry!: " + tid
|
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
|
|
|
logdataissues[tid]=message
|
|
|
|
print(message)
|
|
|
|
|
2021-02-06 00:18:48 +00:00
|
|
|
|
|
|
|
entrytuple = (ldate, tripcave, triptitle, ltriptext,
|
2022-11-23 00:36:44 +00:00
|
|
|
trippeople, expedition, tu, tid)
|
2021-02-06 00:18:48 +00:00
|
|
|
logentries.append(entrytuple)
|
2021-04-23 11:43:25 +01:00
|
|
|
|
2021-02-06 00:18:48 +00:00
|
|
|
except:
|
2021-04-23 16:11:50 +01:00
|
|
|
message = f" ! - Skipping logentry {year} due to exception in: {tid}"
|
2021-02-06 00:18:48 +00:00
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
2021-04-23 11:43:25 +01:00
|
|
|
logdataissues[tid]=message
|
2021-02-06 00:18:48 +00:00
|
|
|
print(message)
|
|
|
|
errorcount += 1
|
|
|
|
if errorcount >5 :
|
2021-04-23 11:43:25 +01:00
|
|
|
message = f" !!- TOO MANY ERRORS - aborting at '{tid}' logbook: {year}"
|
2021-02-06 00:18:48 +00:00
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
2021-04-23 11:43:25 +01:00
|
|
|
logdataissues[tid]=message
|
2021-02-06 00:18:48 +00:00
|
|
|
print(message)
|
|
|
|
return
|
2020-06-08 21:33:32 +01:00
|
|
|
|
2019-03-30 13:58:38 +00:00
|
|
|
# parser for 2003
|
2022-11-21 16:47:25 +00:00
|
|
|
def parser_html_03(year, expedition, txt):
|
2020-06-08 21:33:32 +01:00
|
|
|
global logentries
|
|
|
|
global logdataissues
|
|
|
|
|
2019-03-06 23:20:34 +00:00
|
|
|
tripparas = re.findall(r"<hr\s*/>([\s\S]*?)(?=<hr)", txt)
|
2020-06-08 21:33:32 +01:00
|
|
|
logbook_entry_count = 0
|
2011-07-11 02:10:22 +01:00
|
|
|
for trippara in tripparas:
|
2020-06-08 21:33:32 +01:00
|
|
|
logbook_entry_count += 1
|
2021-04-23 16:11:50 +01:00
|
|
|
tid = set_trip_id(year,logbook_entry_count)
|
2020-06-08 21:33:32 +01:00
|
|
|
|
2021-04-13 00:18:30 +01:00
|
|
|
s = re.match(r"(?s)\s*<p>(.*?)</p>(.*)$", trippara)
|
2021-03-29 02:06:19 +01:00
|
|
|
if not ( s ) :
|
2022-11-21 16:47:25 +00:00
|
|
|
message = " ! - Skipping logentry {year} on failure to parse parser_html_03: {} {} {}...".format(tid,s,trippara[:300])
|
2021-03-29 02:06:19 +01:00
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
2021-04-23 11:43:25 +01:00
|
|
|
logdataissues[tid]=message
|
2021-03-29 02:06:19 +01:00
|
|
|
print(message)
|
|
|
|
break
|
|
|
|
|
2011-07-11 02:10:22 +01:00
|
|
|
tripheader, triptext = s.group(1), s.group(2)
|
2019-03-06 23:20:34 +00:00
|
|
|
tripheader = re.sub(r" ", " ", tripheader)
|
|
|
|
tripheader = re.sub(r"\s+", " ", tripheader).strip()
|
2011-07-11 02:10:22 +01:00
|
|
|
sheader = tripheader.split(" -- ")
|
|
|
|
tu = ""
|
|
|
|
if re.match("T/U|Time underwater", sheader[-1]):
|
|
|
|
tu = sheader.pop()
|
|
|
|
if len(sheader) != 3:
|
2022-08-30 15:58:49 +01:00
|
|
|
print(" ! Header not three pieces", sheader)
|
2011-07-11 02:10:22 +01:00
|
|
|
tripdate, triptitle, trippeople = sheader
|
|
|
|
ldate = ParseDate(tripdate.strip(), year)
|
|
|
|
triptitles = triptitle.split(" , ")
|
|
|
|
if len(triptitles) >= 2:
|
|
|
|
tripcave = triptitles[0]
|
|
|
|
else:
|
|
|
|
tripcave = "UNKNOWN"
|
2019-03-06 23:20:34 +00:00
|
|
|
ltriptext = re.sub(r"</p>", "", triptext)
|
|
|
|
ltriptext = re.sub(r"\s*?\n\s*", " ", ltriptext)
|
|
|
|
ltriptext = re.sub(r"<p>", "\n\n", ltriptext).strip()
|
|
|
|
ltriptext = re.sub(r"[^\s0-9a-zA-Z\-.,:;'!&()\[\]<>?=+*%]", "_NONASCII_", ltriptext)
|
2020-06-08 21:33:32 +01:00
|
|
|
|
|
|
|
|
|
|
|
entrytuple = (ldate, tripcave, triptitle, ltriptext,
|
2022-11-23 00:36:44 +00:00
|
|
|
trippeople, expedition, tu, tid)
|
2020-06-08 21:33:32 +01:00
|
|
|
logentries.append(entrytuple)
|
|
|
|
|
2019-03-06 23:20:34 +00:00
|
|
|
|
2022-03-24 01:05:50 +00:00
|
|
|
def LoadLogbookForExpedition(expedition):
|
2020-05-30 20:31:20 +01:00
|
|
|
""" Parses all logbook entries for one expedition
|
|
|
|
"""
|
2020-06-08 21:33:32 +01:00
|
|
|
# absolutely horrid. REFACTOR THIS (all my fault..)
|
2020-04-12 22:29:30 +01:00
|
|
|
global logentries
|
2021-04-23 03:07:21 +01:00
|
|
|
global logdataissues
|
2022-03-24 01:05:50 +00:00
|
|
|
global entries
|
|
|
|
|
2019-03-06 23:20:34 +00:00
|
|
|
logbook_parseable = False
|
2022-11-21 16:41:52 +00:00
|
|
|
yearlinks = LOGBOOK_PARSER_SETTINGS
|
2020-05-30 20:31:20 +01:00
|
|
|
expologbase = os.path.join(settings.EXPOWEB, "years")
|
2020-06-08 21:33:32 +01:00
|
|
|
logentries=[]
|
|
|
|
|
2022-03-24 01:05:50 +00:00
|
|
|
year = expedition.year
|
|
|
|
expect = entries[year]
|
|
|
|
# print(" - Logbook for: " + year)
|
|
|
|
|
2022-11-23 00:36:44 +00:00
|
|
|
|
2020-06-08 21:33:32 +01:00
|
|
|
|
2021-04-23 03:07:21 +01:00
|
|
|
def cleanerrors(year):
|
|
|
|
global logdataissues
|
|
|
|
dataissues = DataIssue.objects.filter(parser='logbooks')
|
|
|
|
for di in dataissues:
|
2021-04-23 11:43:25 +01:00
|
|
|
ph = year
|
2021-04-23 03:07:21 +01:00
|
|
|
if re.search(ph, di.message) is not None:
|
2021-04-23 16:11:50 +01:00
|
|
|
#print(f' - CLEANING dataissue {di.message}')
|
2021-04-23 03:07:21 +01:00
|
|
|
di.delete()
|
|
|
|
|
2021-04-23 16:11:50 +01:00
|
|
|
#print(f' - CLEAN {year} {len(logdataissues)} {type(logdataissues)} data issues for this year')
|
2021-04-23 11:43:25 +01:00
|
|
|
dellist = []
|
|
|
|
for key, value in logdataissues.items():
|
2021-04-23 16:11:50 +01:00
|
|
|
#print(f' - CLEANING logdataissues [{key}]: {value}')
|
|
|
|
if key.startswith(year):
|
|
|
|
#print(f' - CLEANING logdataissues [{key:12}]: {value} ')
|
2021-04-23 11:43:25 +01:00
|
|
|
dellist.append(key)
|
|
|
|
for i in dellist:
|
|
|
|
del logdataissues[i]
|
2021-04-23 03:07:21 +01:00
|
|
|
|
2022-03-24 01:05:50 +00:00
|
|
|
cleanerrors(year)
|
2021-04-23 03:07:21 +01:00
|
|
|
|
2022-03-24 01:05:50 +00:00
|
|
|
if year in yearlinks:
|
|
|
|
logbookpath = Path(expologbase) / year / yearlinks[year][0]
|
|
|
|
expedition.logbookfile = yearlinks[year][0]
|
|
|
|
parsefunc = yearlinks[year][1]
|
2020-05-30 20:31:20 +01:00
|
|
|
else:
|
2022-11-21 16:41:52 +00:00
|
|
|
logbookpath = Path(expologbase) / year / DEFAULT_LOGBOOK_FILE
|
|
|
|
expedition.logbookfile = DEFAULT_LOGBOOK_FILE
|
|
|
|
parsefunc = DEFAULT_LOGBOOK_PARSER
|
2020-05-30 20:31:20 +01:00
|
|
|
|
2021-11-11 20:57:49 +00:00
|
|
|
expedition.save()
|
2022-11-21 16:41:52 +00:00
|
|
|
|
|
|
|
try:
|
|
|
|
file_in = open(logbookpath,'rb')
|
|
|
|
txt = file_in.read().decode("utf-8")
|
|
|
|
file_in.close()
|
|
|
|
logbook_parseable = True
|
|
|
|
except (IOError):
|
|
|
|
logbook_parseable = False
|
|
|
|
print(" ! Couldn't open logbook as UTF-8 " + logbookpath)
|
|
|
|
except:
|
|
|
|
logbook_parseable = False
|
|
|
|
print(" ! Very Bad Error opening " + logbookpath)
|
2020-05-30 20:31:20 +01:00
|
|
|
|
|
|
|
if logbook_parseable:
|
|
|
|
parser = globals()[parsefunc]
|
2022-11-21 16:26:30 +00:00
|
|
|
print(f' - {year} parsing with {parsefunc}')
|
2022-03-24 01:05:50 +00:00
|
|
|
parser(year, expedition, txt) # this launches the right parser for this year
|
2021-04-23 16:11:50 +01:00
|
|
|
|
2022-03-23 22:55:59 +00:00
|
|
|
i=0
|
|
|
|
for entrytuple in logentries:
|
2022-11-21 16:26:30 +00:00
|
|
|
# date, tripcave, triptitle, text, trippeople, expedition, logtime_underground, tripid1 = entrytuple
|
2022-08-30 15:58:49 +01:00
|
|
|
try:
|
|
|
|
date, tripcave, triptitle, text, trippeople, expedition, logtime_underground, tripid1 = entrytuple
|
2022-11-21 16:26:30 +00:00
|
|
|
except ValueError: # cope with removal of entry_type but still in cache files. Remove in Dec. 2022.
|
2022-08-30 15:58:49 +01:00
|
|
|
date, tripcave, triptitle, text, trippeople, expedition, logtime_underground, entry_type, tripid1 = entrytuple
|
2022-11-23 00:36:44 +00:00
|
|
|
print(f' - Exception entry_type "{entry_type}" {tripid1}')
|
2022-03-23 22:55:59 +00:00
|
|
|
EnterLogIntoDbase(date, tripcave, triptitle, text, trippeople, expedition, 0,
|
2022-08-30 15:58:49 +01:00
|
|
|
tripid1)
|
2022-03-23 22:55:59 +00:00
|
|
|
i +=1
|
2022-03-24 01:05:50 +00:00
|
|
|
|
|
|
|
if len(logentries) == expect:
|
|
|
|
# print(f"OK {year} {len(logentries):5d} is {expect}\n")
|
|
|
|
pass
|
|
|
|
else:
|
2022-11-21 16:26:30 +00:00
|
|
|
print(f"Mismatch {year} {len(logentries):5d} is not {expect}\n")
|
2022-03-24 01:05:50 +00:00
|
|
|
|
2020-06-06 22:51:55 +01:00
|
|
|
return len(logentries)
|
2020-05-28 04:54:53 +01:00
|
|
|
|
2011-07-11 02:10:22 +01:00
|
|
|
def LoadLogbooks():
|
2020-05-30 20:31:20 +01:00
|
|
|
""" This is the master function for parsing all logbooks into the Troggle database.
|
2022-11-21 16:26:30 +00:00
|
|
|
This should be rewritten to use coroutines to load all logbooks from disc in parallel,
|
|
|
|
but must be serialised to write to database as sqlite is single-user.
|
2020-05-30 20:31:20 +01:00
|
|
|
"""
|
2020-06-08 21:33:32 +01:00
|
|
|
global logdataissues
|
2022-03-24 01:05:50 +00:00
|
|
|
global entries
|
2020-06-08 21:33:32 +01:00
|
|
|
|
|
|
|
logdataissues = {}
|
2020-05-30 12:35:15 +01:00
|
|
|
DataIssue.objects.filter(parser='logbooks').delete()
|
|
|
|
expos = Expedition.objects.all()
|
2020-06-06 22:51:55 +01:00
|
|
|
if len(expos) <= 1:
|
2022-03-18 10:21:25 +00:00
|
|
|
message = f" ! - No expeditions found. Load 'people' first"
|
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
|
|
|
logdataissues[f"sqlfail 0000"]=message
|
|
|
|
print(message)
|
|
|
|
|
2022-03-02 21:15:24 +00:00
|
|
|
noexpo = ["1986", "2020", "2021",] #no expo
|
|
|
|
lostlogbook = ["1976", "1977", "1978", "1979", "1980", "1981"]
|
|
|
|
sqlfail = ["1987", "1988", "1989"] # breaks mysql with db constraint fail - debug locally first]
|
|
|
|
nologbook = noexpo + lostlogbook + sqlfail
|
2022-03-24 01:05:50 +00:00
|
|
|
|
2020-06-08 21:33:32 +01:00
|
|
|
nlbe={}
|
|
|
|
expd ={}
|
2022-03-24 01:05:50 +00:00
|
|
|
actuals = []
|
|
|
|
|
2022-10-05 19:10:05 +01:00
|
|
|
for expo in expos: # pointless as we explicitly know the years in this code.
|
2022-03-24 01:05:50 +00:00
|
|
|
year = expo.year
|
|
|
|
TROG['pagecache']['expedition'][year] = None # clear cache
|
|
|
|
if year in sqlfail:
|
|
|
|
print(" - Logbook for: " + year + " NO parsing attempted - known sql failures")
|
|
|
|
message = f" ! - Not even attempting to parse logbook for {year} until code fixed"
|
|
|
|
DataIssue.objects.create(parser='logbooks', message=message)
|
|
|
|
logdataissues[f"sqlfail {year}"]=message
|
|
|
|
print(message)
|
2022-03-02 21:15:24 +00:00
|
|
|
|
2022-03-24 01:05:50 +00:00
|
|
|
if year not in nologbook:
|
|
|
|
if year in entries:
|
|
|
|
actuals.append(expo)
|
|
|
|
else:
|
|
|
|
print(" - No Logbook yet for: " + year) # catch case when preparing for next expo
|
|
|
|
|
|
|
|
for ex in actuals:
|
|
|
|
nlbe[ex] = LoadLogbookForExpedition(ex) # this actually loads the logbook for one expo
|
2020-06-08 21:33:32 +01:00
|
|
|
|
2022-03-24 01:05:50 +00:00
|
|
|
# tried to use map with concurrent threads - but sqlite database is not concurrent, so failed with database lock
|
|
|
|
# yt = 0
|
|
|
|
# for r in map(LoadLogbookForExpedition, actuals):
|
|
|
|
# yt = r
|
|
|
|
|
|
|
|
yt = 0
|
|
|
|
for e in nlbe:
|
|
|
|
yt += nlbe[e]
|
|
|
|
print(f"total {yt:,} log entries parsed in all expeditions")
|
|
|
|
|
2022-03-02 21:15:24 +00:00
|
|
|
|
2019-03-06 23:20:34 +00:00
|
|
|
|
2021-04-23 16:11:50 +01:00
|
|
|
# dateRegex = re.compile(r'<span\s+class="date">(\d\d\d\d)-(\d\d)-(\d\d)</span>', re.S)
|
|
|
|
# expeditionYearRegex = re.compile(r'<span\s+class="expeditionyear">(.*?)</span>', re.S)
|
|
|
|
# titleRegex = re.compile(r'<H1>(.*?)</H1>', re.S)
|
|
|
|
# reportRegex = re.compile(r'<div\s+class="report">(.*)</div>\s*</body>', re.S)
|
|
|
|
# personRegex = re.compile(r'<div\s+class="person">(.*?)</div>', re.S)
|
|
|
|
# nameAuthorRegex = re.compile(r'<span\s+class="name(,author|)">(.*?)</span>', re.S)
|
|
|
|
# TURegex = re.compile(r'<span\s+class="TU">([0-9]*\.?[0-9]+)</span>', re.S)
|
|
|
|
# locationRegex = re.compile(r'<span\s+class="location">(.*?)</span>', re.S)
|
|
|
|
# caveRegex = re.compile(r'<span\s+class="cave">(.*?)</span>', re.S)
|
2011-07-11 02:10:22 +01:00
|
|
|
|