From a5011d7c65327746caf51c187622206f4ab4fb10 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Sun, 30 Jun 2024 00:13:41 +0300
Subject: [PATCH] tidy old weirdly named entrance slugs to modern format

---
 cave_data/1623-1.html                         |  4 +-
 cave_data/1623-52.html                        |  5 +-
 cave_data/1623-71.html                        |  5 +-
 entrance_data/{1623-1a b.html => 1623-1.html} |  2 +-
 entrance_data/1623-1ab.html                   | 48 -------------------
 .../{1623-52ab.html => 1623-52.html}          |  2 +-
 .../{1623-71ab.html => 1623-71.html}          |  2 +-
 7 files changed, 9 insertions(+), 59 deletions(-)
 rename entrance_data/{1623-1a b.html => 1623-1.html} (97%)
 delete mode 100644 entrance_data/1623-1ab.html
 rename entrance_data/{1623-52ab.html => 1623-52.html} (98%)
 rename entrance_data/{1623-71ab.html => 1623-71.html} (98%)

diff --git a/cave_data/1623-1.html b/cave_data/1623-1.html
index 77932becc..cc4162283 100644
--- a/cave_data/1623-1.html
+++ b/cave_data/1623-1.html
@@ -39,8 +39,8 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number></unofficial_number><!-- (This is any name. Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
 
 <entrance>
-  <entranceslug>1623-1a b</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
-  <letter>a b</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-1</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
+  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
 </entrance>
 
 <explorers></p><ul><li>H&ouml;hlenforschervereinigung Altaussee, 19xx</li><li>Sektion Ausseerland 1960</li><li>Dived by Verein f&uuml;r H&ouml;hlenkunde in Obersteier in 1984 and 1985, when the final sump went to about -20m. On the first occasion they spoiled the visibility in the sump by not being careful enough about how they drained the sump on the approach route.</li></ul><p></explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
diff --git a/cave_data/1623-52.html b/cave_data/1623-52.html
index 7a03f7407..ef35e2ea0 100644
--- a/cave_data/1623-52.html
+++ b/cave_data/1623-52.html
@@ -39,9 +39,8 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number></unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
 
 <entrance>
-  <entranceslug>1623-52a b</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
-  <!-- DEBUG  1623-52+1623-52a b 'Z' =a b= -->
-  <letter>a b</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-52</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
+  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrance then the letter needs to be given. Generally matches the entranceslug ID.  -->
 </entrance>
 
 <explorers>Sektion Ausseerland, 1968 </explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
diff --git a/cave_data/1623-71.html b/cave_data/1623-71.html
index cb630db69..506e3e28d 100644
--- a/cave_data/1623-71.html
+++ b/cave_data/1623-71.html
@@ -39,9 +39,8 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number></unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
 
 <entrance>
-  <entranceslug>1623-71a b</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
-  <!-- DEBUG  1623-71+1623-71a b 'Z' =a b= -->
-  <letter>a b</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-71</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
+   <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
 </entrance>
 
 <explorers>Discovered by Karl Gaisberger in October 1975, but prevented from continuing by start of winter snows, so shared exploration with CUCC, 1976.</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
diff --git a/entrance_data/1623-1a b.html b/entrance_data/1623-1.html
similarity index 97%
rename from entrance_data/1623-1a b.html
rename to entrance_data/1623-1.html
index b8c26b08d..e6202d09d 100644
--- a/entrance_data/1623-1a b.html	
+++ b/entrance_data/1623-1.html
@@ -19,7 +19,7 @@ though, you do not need to do a data import as it happens automatically -->
 <br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-1a b</slug> <!-- one entrance and one slug per entrance_data file -->
+<slug>1623-1</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
diff --git a/entrance_data/1623-1ab.html b/entrance_data/1623-1ab.html
deleted file mode 100644
index 39682e83c..000000000
--- a/entrance_data/1623-1ab.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<!-- Only put one entrance in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<entrance>
-<non_public>False</non_public>
-<slug>1623-1a b</slug>
-<name></name>
-<entrance_description></entrance_description>
-<explorers></explorers>
-<map_description>28.1 cm E, 15.4 cm N, sheet 15/1 Alpine Club 1:25000 map</map_description>
-<location_description>At the foot of a gully cutting the southwestern end of Steller, a major cliff band SE of the Loser - Br&auml;uning area. A couple of hundred metres north of the Youth Hostel at the NE corner of Altausseer See.</location_description>
-<approach>If you follow the lakeside path (shortest approach from Altaussee on north side of lake) there is a junction where the path to Hochklapfsattel departs. A short way west of (ie. before) this junction is a bridge over a normally dry stream bed. Follow the stream bed up for a short way until it splits, then follow the apparently smaller branch to the right (east). Scramble up rocks to the East Entrance. This is marked on the Alpine Club 1:25000 map.</p><p>Although the Altitude given is 812m, it doesn't seem that high, and 812m is exactly 100m above lake level, which is a little suspicious. If you accept instead the phrase "climb 70m higher" in the original kataster description, the altitude comes out about 780 to 785m, which puts the final sump at almost exactly the level of the lake.</approach>
-<underground_description></underground_description>
-<photo></p><table class="imgtable"> <tr> <td><a href="/guidebook/liager.jpg"><img src="/guidebook/liager_small.jpg" /></a></td> <td><a href="/guidebook/liagerview.jpg"><img src="/guidebook/liagerview_small.jpg" /></a></td><td><a href="/guidebook/flood.jpg"><img src="/guidebook/flood_small.jpg" /></a></tr><tr class="caption"> <td>Entrance</td><td>View from entrance towards Altaussee</td><td>Entrance in 2006 after 9 days' straight rain</td></tr> </table> <p>Photos &copy; Mark Shinwell 2005 (1,2) + Dave Loeffler 2006 (3).</photo>
-<!-- marking options: P  = Paint,
-                      P? = Paint (?),
-                      T  = Tag,
-                      T? = Tag (?),
-                      R  = Retagged,
-                      S  = Spit,
-                      S? = Spit (?),
-                      U  = Unmarked,
-                      ?  = Unknown" -->
-<marking></marking> 
-<marking_comment></marking_comment>
-<!-- findability options: ? = To be confirmed ...,
-                          S = Surveyed,
-                          L = Lost,
-                          R = Refindable" -->
-<findability>S</findability>
-<findability_description></findability_description>
-<alt>East Entrance 812m West entrance 809m</alt>
-<northing></northing>
-<easting></easting> 
-<tag_station></tag_station>
-<exact_station></exact_station>
-<other_station>1623.p1</other_station>
-<other_description>post selective availability GPS</other_description>
-<bearings></bearings>
-<url></url>
-</entrance>
-</body>
-</html>
diff --git a/entrance_data/1623-52ab.html b/entrance_data/1623-52.html
similarity index 98%
rename from entrance_data/1623-52ab.html
rename to entrance_data/1623-52.html
index 446cf8e49..a198d7e06 100644
--- a/entrance_data/1623-52ab.html
+++ b/entrance_data/1623-52.html
@@ -8,7 +8,7 @@
 <body>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-52a b</slug>
+<slug>1623-52</slug>
 <name></name>
 <entrance_description>In a 15m by 6m wide rift is the 6m by 4m entrance to the Sauloch. This is in a steep-sided doline used as a dumping place for all sorts of refuse.</entrance_description>
 <explorers></explorers>
diff --git a/entrance_data/1623-71ab.html b/entrance_data/1623-71.html
similarity index 98%
rename from entrance_data/1623-71ab.html
rename to entrance_data/1623-71.html
index 5811f0253..efcaf5863 100644
--- a/entrance_data/1623-71ab.html
+++ b/entrance_data/1623-71.html
@@ -8,7 +8,7 @@
 <body>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-71a b</slug>
+<slug>1623-71</slug>
 <name></name>
 <entrance_description>Entrance is in a fair-sized shakehole in the dwarf-pine-covered karren before Schwarzmoossattel.</entrance_description>
 <explorers></explorers>