summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/models/caves.py35
-rw-r--r--parsers/caves.py4
2 files changed, 35 insertions, 4 deletions
diff --git a/core/models/caves.py b/core/models/caves.py
index 997bbdb..81c1789 100644
--- a/core/models/caves.py
+++ b/core/models/caves.py
@@ -662,8 +662,39 @@ def GetCaveLookup():
("tempest", "1623-2023-lc-01"),
("1623-2023-kt-02", "2023-kt-02"),
-
- # 1626 aliases
+
+ # rename caves-1623/{2023-ASH-15/2023-ASH-15.svx => 303/303.svx} (94%)
+ # rename caves-1623/{2023-mg-02/2023-mg-02.svx => 304/304.svx} (90%)
+ # rename caves-1623/{2023-mg-01/2023-mg-01.svx => 305/305.svx} (94%)
+ # rename caves-1623/{2023-ASH-17/2023-ASH-17.svx => 306/306.svx} (94%)
+ # rename caves-1623/{2023-ASH-05/2023-ASH-05.svx => 307/307.svx} (89%)
+ # rename caves-1623/{2023-ASH-08/2023-ASH-08.svx => 308/308.svx} (93%)
+ # rename caves-1623/{2023-ASH-09/2023-ASH-09.svx => 309/309.svx} (94%)
+ # rename caves-1623/{2023-mg-04/2023-mg-04.svx => 310/310.svx} (91%)
+ # rename caves-1623/{2023-ASH-16/2023-ASH-16.svx => 311/311.svx} (93%)
+ # rename caves-1623/{2023-RAWDB-02/2023-RAWDB-02.svx => 312/312.svx} (92%)
+ # rename caves-1623/{2023-RAWDB-01/2023-RAWDB-01.svx => 313/313.svx} (92%)
+ # rename caves-1623/{2023-kt-02/2023-kt-02.svx => 314/314.svx} (95%)
+ # rename caves-1623/{2023-jss-01 => 315}/2023-jss-01_trip1.svx (100%)
+ # rename caves-1623/{2023-jss-01 => 315}/2023-jss-01_trip2.svx (100%)
+ # rename caves-1623/{2023-jss-01/2023-jss-01.svx => 315/315.svx} (68%)
+ # rename caves-1623/{2023-kt-01/2023-kt-01.svx => 316/316.svx} (92%)
+ ("2023-ASH-15", "1623-303"),
+ ("2023-mg-02", "1623-304"),
+ ("2023-mg-01", "1623-305"),
+ ("2023-ASH-17", "1623-306"),
+ ("2023-ASH-05", "1623-307"),
+ ("2023-ASH-08", "1623-308"),
+ ("2023-ASH-09", "1623-309"),
+ ("2023-mg-04", "1623-310"),
+ ("2023-ASH-16", "1623-311"),
+ ("2023-RAWDB-02", "1623-312"),
+ ("2023-RAWDB-01", "1623-313"),
+ ("2023-kt-02", "1623-314"),
+ ("2023-jss-01", "1623-315"),
+ ("2023-kt-01", "1623-316"),
+
+ # 1626 aliases2023-mg-01/2023-mg-01.svx => 305
("langgustl", "1626-354"),
("2018-dm-07", "1626-359"),
("1626-2018-dm-07", "1626-359"),
diff --git a/parsers/caves.py b/parsers/caves.py
index d8c8006..baea009 100644
--- a/parsers/caves.py
+++ b/parsers/caves.py
@@ -685,11 +685,11 @@ def read_cave(filename, cave=None):
if kataster_number:
if slug == f"{areacode}-{kataster_number}":
return
- message = f" ! Cave Slug incorrect (kataster): '{slug}' != '{areacode}-{kataster_number}' {url=} in file {filename}"
+ message = f" ! Cave Slug mismatch (kataster): '{slug}' != '{areacode}-{kataster_number}' {url=} in file {filename}"
else:
if slug == f"{areacode}-{unofficial_number}":
return
- message = f" ! Cave Slug incorrect (unofficial): '{slug}' != '{areacode}-{unofficial_number}' {url=} in file {filename}"
+ message = f" ! Cave Slug mismatch (unofficial): '{slug}' != '{areacode}-{unofficial_number}' {url=} in file {filename}"
if slug.lower() == f"{areacode}-{unofficial_number.lower()}":
message = f" ! Cave Slug capitalisation incorrect (unofficial): '{slug}' != '{areacode}-{unofficial_number}' {url=} in file {filename}"
DataIssue.objects.create(parser="caves", message=message, url=f"{cave.slug}_cave_edit/")