diff options
| author | Philip Sargent <philip.sargent@gmail.com> | 2020-04-12 23:03:00 +0100 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@gmail.com> | 2020-04-12 23:03:00 +0100 |
| commit | e08b4275a9b9612d3ce1d14b4c66dd4d54c7f986 (patch) | |
| tree | 587b01e8abe2732aabea3f31fbff1d315fc39d92 | |
| parent | ac9f3cf061981a801327b02d29b35eb9777705d4 (diff) | |
| download | troggle-e08b4275a9b9612d3ce1d14b4c66dd4d54c7f986.tar.gz troggle-e08b4275a9b9612d3ce1d14b4c66dd4d54c7f986.tar.bz2 troggle-e08b4275a9b9612d3ce1d14b4c66dd4d54c7f986.zip | |
2010 is html format not wiki format.
Or at least, now it is.
| -rw-r--r-- | parsers/logbooks.py | 4 | ||||
| -rw-r--r-- | settings.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/parsers/logbooks.py b/parsers/logbooks.py index 9f47d4f..9971ed6 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -133,7 +133,7 @@ def ParseDate(tripdate, year): assert False, tripdate return datetime.date(year, month, day) -# 2006, 2008 - 2010 +# 2006, 2008 - 2009 def Parselogwikitxt(year, expedition, txt): trippara = re.findall(r"===(.*?)===([\s\S]*?)(?====)", txt) for triphead, triptext in trippara: @@ -158,7 +158,7 @@ def Parselogwikitxt(year, expedition, txt): #print "\n", tripcave, "--- ppp", trippeople, len(triptext) EnterLogIntoDbase(date = ldate, place = tripcave, title = tripplace, text = triptext, trippeople=trippeople, expedition=expedition, logtime_underground=0) -# 2002, 2004, 2005, 2007, 2011 - 2018 +# 2002, 2004, 2005, 2007, 2010 - 2018 def Parseloghtmltxt(year, expedition, txt): #print(" - Starting log html parser") tripparas = re.findall(r"<hr\s*/>([\s\S]*?)(?=<hr)", txt) diff --git a/settings.py b/settings.py index e6f1546..6710e72 100644 --- a/settings.py +++ b/settings.py @@ -69,7 +69,7 @@ LOGBOOK_PARSER_SETTINGS = { "2013": ("2013/logbook.html", "Parseloghtmltxt"), "2012": ("2012/logbook.html", "Parseloghtmltxt"), "2011": ("2011/logbook.html", "Parseloghtmltxt"), - "2010": ("2010/logbook.html", "Parselogwikitxt"), + "2010": ("2010/logbook.html", "Parseloghtmltxt"), "2009": ("2009/2009logbook.txt", "Parselogwikitxt"), "2008": ("2008/2008logbook.txt", "Parselogwikitxt"), "2007": ("2007/logbook.html", "Parseloghtmltxt"), |