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

convert old logbooks to modern format

Browse Source
This commit is contained in:
Philip Sargent 2022-12-20 16:38:32 +00:00
parent 9169abdb05
commit dc3a61addd
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parsers/imports.py
View File

@ -41,7 +41,7 @@ def import_logbooks():
with transaction.atomic():
troggle.parsers.logbooks.LoadLogbooks()
def import_logbook(year=2019):
def import_logbook(year=1982):
print(f"-- Importing Logbook {year}")
with transaction.atomic():
troggle.parsers.logbooks.LoadLogbook(year)

10
parsers/logbooks.py
View File

@ -77,10 +77,10 @@ LOGBOOK_PARSER_SETTINGS = {
"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"),
"1985": ("logbook.html", "parser_html"),
"1984": ("logbook.html", "parser_html"),
"1983": ("logbook.html", "parser_html"),
"1982": ("logbook.html", "parser_html"),
}
entries = { "2022": 86, "2019": 56, "2018": 100, "2017": 76, "2016": 83, "2015": 79,
@ -89,7 +89,7 @@ entries = { "2022": 86, "2019": 56, "2018": 100, "2017": 76, "2016": 83, "2015":
"2001": 48, "2000": 54, "1999": 79, "1998": 43, "1997": 53, "1996": 95, "1995": 42,
"1994": 32, "1993": 41, "1992": 62, "1991": 39, "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.
# Logbooks log.htm exist for 87, 88, 89 but have no full-working parser, or need hand-editing.
logentries = [] # the entire logbook for one year is a single object: a list of entries
noncaveplaces = [ "Journey", "Loser Plateau", "UNKNOWN", 'plateau',

2
templates/cavewallets.html
View File

@ -15,7 +15,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
<p>This lists all the files in a wallet, some of which may not be for this specific cave.
<p>See also wallets
<ul>
<li>per person, e.g. <a href="/wallets/person/Wookey">Wookey</a>, <a href="/wallets/person/ChrisDensham">Chris Densham</a>, <a href="/wallets/person/MartinGreen">Martin Green</a>, <a href="/wallets/person/AndrewAtkinson">Andrew Atkinson</a>, <a href="/wallets/person/JulianTodd">Julian Todd</a>, <a href="/wallets/person/Jenny Black">Jenny Black</a> <a href="/wallets/person/FrankTully">FrankTully</a>, <a href="/wallets/person/BeckaLawson">Becka</a>
<li>per person, e.g. <a href="/wallets/person/Wookey">Wookey</a>, <a href="/wallets/person/ChrisDensham">Chris Densham</a>, <a href="/wallets/person/MartinGreen">Martin Green</a>, <a href="/wallets/person/AndrewAtkinson">Andrew Atkinson</a>, <a href="/wallets/person/JulianTodd">Julian Todd</a>, <a href="/wallets/person/Jenny Black">Jenny Black</a> <a href="/wallets/person/FrankTully">Frank Tully</a>, <a href="/wallets/person/DaveLoeffler">Dave Loeffler</a>, <a href="/wallets/person/BeckaLawson">Becka</a>
<li>per year:
{% for otherexpedition in expeditions %}
| <a <a href="/wallets/year/{{ otherexpedition.year }}">{{otherexpedition.year}}</a>

2
templates/logbookentry.html
View File

@ -1,6 +1,6 @@
{% extends "base.html" %}
<!-- templates/logbookentry.html - this text visible because this template has been included -->
{% block title %}Logbook {{logbookentry.expedition.name}}{% endblock %}
{% block title %}Logbook {{logbookentry.expedition.name}} {{logbookentry.title|safe}}{% endblock %}
{% block content %}
{% block related %}{% endblock %}

2
templates/yearwallets.html
View File

@ -16,7 +16,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
<p>See also wallets
<ul style="width: 78%">
<li>per cave, e.g. <a href="/cave/scans/1623-161">1623-161</a>, <a href="/cave/scans/1626-359">1626-359</a>, <a href="/cave/scans/1623-290">1623-290</a>, <a href="/cave/scans/1623-291">1623-291</a>, <a href="/cave/scans/1623-264">1623-264</a>
<li>per person, e.g. <a href="/wallets/person/Wookey">Wookey</a>, <a href="/wallets/person/ChrisDensham">Chris Densham</a>, <a href="/wallets/person/MartinGreen">Martin Green</a>, <a href="/wallets/person/AndrewAtkinson">Andrew Atkinson</a>, <a href="/wallets/person/JulianTodd">Julian Todd</a>, <a href="/wallets/person/Frank Tully">FrankTully</a>, <a href="/wallets/person/BeckaLawson">Becka</a>
<li>per person, e.g. <a href="/wallets/person/Wookey">Wookey</a>, <a href="/wallets/person/ChrisDensham">Chris Densham</a>, <a href="/wallets/person/MartinGreen">Martin Green</a>, <a href="/wallets/person/AndrewAtkinson">Andrew Atkinson</a>, <a href="/wallets/person/JulianTodd">Julian Todd</a>, <a href="/wallets/person/Frank Tully">FrankTully</a>, <a href="/wallets/person/DaveLoeffler">Dave Loeffler</a>, <a href="/wallets/person/BeckaLawson">Becka</a>
<li>other years:
{% for otherexpedition in expeditions %}
{% if otherexpedition == expedition %}