summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@gmail.com>2021-11-05 23:01:10 +0200
committerPhilip Sargent <philip.sargent@gmail.com>2021-11-05 23:01:10 +0200
commitdf43aae33d4001e3b393451625a2634af3f4e505 (patch)
tree906df558fa3b9911c53888ccbe4617e2b9d4ecf6
parentb461b87df646a705fd37afa41afff231d3e0d170 (diff)
downloadtroggle-df43aae33d4001e3b393451625a2634af3f4e505.tar.gz
troggle-df43aae33d4001e3b393451625a2634af3f4e505.tar.bz2
troggle-df43aae33d4001e3b393451625a2634af3f4e505.zip
2021 docm update re logbook imports
-rw-r--r--parsers/logbooks.py6
-rwxr-xr-xpre-run.sh2
2 files changed, 6 insertions, 2 deletions
diff --git a/parsers/logbooks.py b/parsers/logbooks.py
index 2c52aa3..9007d4f 100644
--- a/parsers/logbooks.py
+++ b/parsers/logbooks.py
@@ -29,6 +29,8 @@ todo='''
- 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
+
- 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
volume of code here substantially.
@@ -647,8 +649,8 @@ def LoadLogbooks():
print(" ! No expeditions found. Load 'people' first.\n")
nologbook = ["1976", "1977", "1978", "1979", "1980", "1981",
"1987", "1988", "1989", # breaks mysql with db constraint fail - debug locally first
- "1986", "2020",] #no expo
- entries = {"2021": 0, "2019": 20, "2018": 74, "2017": 60, "2016": 81, "2015": 79,
+ "1986", "2020", "2021",] #no expo
+ entries = { "2019": 20, "2018": 74, "2017": 60, "2016": 81, "2015": 79,
"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,
diff --git a/pre-run.sh b/pre-run.sh
index 8f31bee..4153294 100755
--- a/pre-run.sh
+++ b/pre-run.sh
@@ -23,3 +23,5 @@ python3 manage.py check -v 3 --deploy
echo ""
echo `tail -1 lines-of-python.txt` non-comment lines of python.
echo `tail -1 lines-of-templates.txt` non-comment lines of HTML templates.
+
+echo 'If you have an error running manage.py, maybe you are not in an activated venv ? \ No newline at end of file