From eef5a1f883240d6234c9d438d9d6075930fd92ca Mon Sep 17 00:00:00 2001
From: Wookey <wookey@wookware.org>
Date: Wed, 25 May 2016 03:40:50 +0100
Subject: [PATCH] Attempt to make whole 2004-?? series use cavenum/index.html
 type URLs

---
 .hgignore                          | 34 +++++++++++++++---------------
 noinfo/cave_data/1623-2004-01.html |  2 +-
 noinfo/cave_data/1623-2004-02.html |  2 +-
 noinfo/cave_data/1623-2004-03.html |  4 ++--
 noinfo/cave_data/1623-2004-04.html |  4 ++--
 noinfo/cave_data/1623-2004-05.html |  4 ++--
 noinfo/cave_data/1623-2004-06.html |  4 ++--
 noinfo/cave_data/1623-2004-07.html |  4 ++--
 noinfo/cave_data/1623-2004-08.html |  4 ++--
 noinfo/cave_data/1623-2004-09.html |  4 ++--
 noinfo/cave_data/1623-2004-10.html |  4 ++--
 noinfo/cave_data/1623-2004-13.html |  4 ++--
 noinfo/cave_data/1623-2004-14.html |  4 ++--
 noinfo/cave_data/1623-2004-16.html |  4 ++--
 noinfo/cave_data/1623-2004-17.html |  4 ++--
 noinfo/cave_data/1623-2004-18.html |  4 ++--
 noinfo/cave_data/1623-2004-21.html |  4 ++--
 years/2005/surfacework.html        | 14 ++++++------
 years/2006/mission.html            |  6 +++---
 years/2007/surf76.html             |  4 ++--
 20 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/.hgignore b/.hgignore
index 57380569b..05ed9b9b4 100644
--- a/.hgignore
+++ b/.hgignore
@@ -92,13 +92,13 @@ noinfo/prospecting_guide_tcarea.jpg
 1623/200.htm
 1623/2004-01/index.html
 1623/2004-02/index.html
-1623/2004-03.html
-1623/2004-04.html
-1623/2004-05.html
-1623/2004-06.html
-1623/2004-07.html
-1623/2004-08.html
-1623/2004-09.html
+1623/2004-03/index.html
+1623/2004-04/index.html
+1623/2004-05/index.html
+1623/2004-06/index.html
+1623/2004-07/index.html
+1623/2004-08/index.html
+1623/2004-09/index.html
 1623/2005-91/2005-91.html
 1623/2005-92/2005-92.html
 1623/2005-93/2005-93.html
@@ -248,16 +248,16 @@ noinfo/prospecting_guide_tcarea.jpg
 1623/2003-X16.html
 1623/2003-X17.html
 1623/2003-X18.html
-1623/2004-10/2004-10.html
-1623/2004-13.html
-1623/2004-14/2004-14.html
-1623/2004-15/2004-15.html
-1623/2004-16/2004-16.html
-1623/2004-17/2004-17.html
-1623/2004-18/2004-18.html
-1623/2004-19/2004-19.html
-1623/2004-20/2004-20.html
-1623/2004-21/2004-21.html
+1623/2004-10/index.html
+1623/2004-13/index.html
+1623/2004-14/index.html
+1623/2004-15/index.html
+1623/2004-16/index.html
+1623/2004-17/index.html
+1623/2004-18/index.html
+1623/2004-19/index.html
+1623/2004-20/index.html
+1623/2004-21/index.html
 1623/2005-01.html
 1623/2005-02.html
 1623/2005-03.html
diff --git a/noinfo/cave_data/1623-2004-01.html b/noinfo/cave_data/1623-2004-01.html
index 723a44946..31134b020 100644
--- a/noinfo/cave_data/1623-2004-01.html
+++ b/noinfo/cave_data/1623-2004-01.html
@@ -35,7 +35,7 @@
 <depth>5m</depth>
 <extent></extent>
 <survex_file>caves/2004-01/2004-01.svx</survex_file>
-<description_file>1623/2004-01/index.html</description_file>
+<description_file></description_file>
 <url>1623/2004-01/index.html</url>
 </cave>
 </body>
diff --git a/noinfo/cave_data/1623-2004-02.html b/noinfo/cave_data/1623-2004-02.html
index 7b4930fef..9d65eb7ef 100644
--- a/noinfo/cave_data/1623-2004-02.html
+++ b/noinfo/cave_data/1623-2004-02.html
@@ -33,7 +33,7 @@
 <depth></depth>
 <extent></extent>
 <survex_file></survex_file>
-<description_file>1623/2004-02/index.html</description_file>
+<description_file></description_file>
 <url>1623/2004-02/index.html</url>
 </cave>
 </body>
diff --git a/noinfo/cave_data/1623-2004-03.html b/noinfo/cave_data/1623-2004-03.html
index 371c74d73..cad214ce7 100644
--- a/noinfo/cave_data/1623-2004-03.html
+++ b/noinfo/cave_data/1623-2004-03.html
@@ -33,8 +33,8 @@
 <depth></depth>
 <extent></extent>
 <survex_file>caves/2004-03/2004-03.svx</survex_file>
-<description_file>1623/2004-03.html</description_file>
-<url>1623/2004-03.html</url>
+<description_file></description_file>
+<url>1623/2004-03/index.html</url>
 </cave>
 </body>
 </html>
diff --git a/noinfo/cave_data/1623-2004-04.html b/noinfo/cave_data/1623-2004-04.html
index 1857e8fe2..551292b55 100644
--- a/noinfo/cave_data/1623-2004-04.html
+++ b/noinfo/cave_data/1623-2004-04.html
@@ -33,8 +33,8 @@
 <depth></depth>
 <extent></extent>
 <survex_file></survex_file>
-<description_file>1623/2004-04.html</description_file>
-<url>1623/2004-04.html</url>
+<description_file></description_file>
+<url>1623/2004-04/index.html</url>
 </cave>
 </body>
 </html>
diff --git a/noinfo/cave_data/1623-2004-05.html b/noinfo/cave_data/1623-2004-05.html
index 07922b253..0138c93c9 100644
--- a/noinfo/cave_data/1623-2004-05.html
+++ b/noinfo/cave_data/1623-2004-05.html
@@ -33,8 +33,8 @@
 <depth></depth>
 <extent></extent>
 <survex_file></survex_file>
-<description_file>1623/2004-05.html</description_file>
-<url>1623/2004-05.html</url>
+<description_file></description_file>
+<url>1623/2004-05/index.html</url>
 </cave>
 </body>
 </html>
diff --git a/noinfo/cave_data/1623-2004-06.html b/noinfo/cave_data/1623-2004-06.html
index 060d425c9..6cd35d3c5 100644
--- a/noinfo/cave_data/1623-2004-06.html
+++ b/noinfo/cave_data/1623-2004-06.html
@@ -33,8 +33,8 @@
 <depth></depth>
 <extent></extent>
 <survex_file></survex_file>
-<description_file>1623/2004-06.html</description_file>
-<url>1623/2004-06.html</url>
+<description_file></description_file>
+<url>1623/2004-06/index.html</url>
 </cave>
 </body>
 </html>
diff --git a/noinfo/cave_data/1623-2004-07.html b/noinfo/cave_data/1623-2004-07.html
index c2f3565df..6f4a9ef3a 100644
--- a/noinfo/cave_data/1623-2004-07.html
+++ b/noinfo/cave_data/1623-2004-07.html
@@ -33,8 +33,8 @@
 <depth></depth>
 <extent></extent>
 <survex_file></survex_file>
-<description_file>1623/2004-07.html</description_file>
-<url>1623/2004-07.html</url>
+<description_file></description_file>
+<url>1623/2004-07/index.html</url>
 </cave>
 </body>
 </html>
diff --git a/noinfo/cave_data/1623-2004-08.html b/noinfo/cave_data/1623-2004-08.html
index f9c2136d6..9025d9341 100644
--- a/noinfo/cave_data/1623-2004-08.html
+++ b/noinfo/cave_data/1623-2004-08.html
@@ -33,8 +33,8 @@
 <depth></depth>
 <extent></extent>
 <survex_file></survex_file>
-<description_file>1623/2004-08.html</description_file>
-<url>1623/2004-08.html</url>
+<description_file></description_file>
+<url>1623/2004-08/index.html</url>
 </cave>
 </body>
 </html>
diff --git a/noinfo/cave_data/1623-2004-09.html b/noinfo/cave_data/1623-2004-09.html
index 3d032da97..6fd7cc1c4 100644
--- a/noinfo/cave_data/1623-2004-09.html
+++ b/noinfo/cave_data/1623-2004-09.html
@@ -33,8 +33,8 @@
 <depth></depth>
 <extent></extent>
 <survex_file></survex_file>
-<description_file>1623/2004-09.html</description_file>
-<url>1623/2004-09.html</url>
+<description_file></description_file>
+<url>1623/2004-09/index.html</url>
 </cave>
 </body>
 </html>
diff --git a/noinfo/cave_data/1623-2004-10.html b/noinfo/cave_data/1623-2004-10.html
index ccee810ee..bccb0f73f 100644
--- a/noinfo/cave_data/1623-2004-10.html
+++ b/noinfo/cave_data/1623-2004-10.html
@@ -33,8 +33,8 @@
 <depth></depth>
 <extent></extent>
 <survex_file></survex_file>
-<description_file>1623/2004-10.html</description_file>
-<url>1623/2004-10.html</url>
+<description_file></description_file>
+<url>1623/2004-10/index.html</url>
 </cave>
 </body>
 </html>
diff --git a/noinfo/cave_data/1623-2004-13.html b/noinfo/cave_data/1623-2004-13.html
index 9687badd5..d2180475f 100644
--- a/noinfo/cave_data/1623-2004-13.html
+++ b/noinfo/cave_data/1623-2004-13.html
@@ -33,8 +33,8 @@
 <depth></depth>
 <extent></extent>
 <survex_file></survex_file>
-<description_file>1623/2004-13.html</description_file>
-<url>1623/2004-13.html</url>
+<description_file></description_file>
+<url>1623/2004-13/index.html</url>
 </cave>
 </body>
 </html>
diff --git a/noinfo/cave_data/1623-2004-14.html b/noinfo/cave_data/1623-2004-14.html
index b35d9dfdd..0bce5add0 100644
--- a/noinfo/cave_data/1623-2004-14.html
+++ b/noinfo/cave_data/1623-2004-14.html
@@ -33,8 +33,8 @@
 <depth></depth>
 <extent></extent>
 <survex_file>caves/2004-14/2004-14.svx</survex_file>
-<description_file>1623/2004-14.html</description_file>
-<url>1623/2004-14.html</url>
+<description_file></description_file>
+<url>1623/2004-14/index.html</url>
 </cave>
 </body>
 </html>
diff --git a/noinfo/cave_data/1623-2004-16.html b/noinfo/cave_data/1623-2004-16.html
index b86cac0ac..b45c62061 100644
--- a/noinfo/cave_data/1623-2004-16.html
+++ b/noinfo/cave_data/1623-2004-16.html
@@ -33,8 +33,8 @@
 <depth></depth>
 <extent></extent>
 <survex_file></survex_file>
-<description_file>1623/2004-16.html</description_file>
-<url>1623/2004-16.html</url>
+<description_file></description_file>
+<url>1623/2004-16/index.html</url>
 </cave>
 </body>
 </html>
diff --git a/noinfo/cave_data/1623-2004-17.html b/noinfo/cave_data/1623-2004-17.html
index f67252a8d..3c3c84627 100644
--- a/noinfo/cave_data/1623-2004-17.html
+++ b/noinfo/cave_data/1623-2004-17.html
@@ -33,8 +33,8 @@
 <depth></depth>
 <extent></extent>
 <survex_file></survex_file>
-<description_file>1623/2004-17.html</description_file>
-<url>1623/2004-17.html</url>
+<description_file></description_file>
+<url>1623/2004-17/index.html</url>
 </cave>
 </body>
 </html>
diff --git a/noinfo/cave_data/1623-2004-18.html b/noinfo/cave_data/1623-2004-18.html
index a1f545017..9b33ea93b 100644
--- a/noinfo/cave_data/1623-2004-18.html
+++ b/noinfo/cave_data/1623-2004-18.html
@@ -33,8 +33,8 @@
 <depth></depth>
 <extent></extent>
 <survex_file></survex_file>
-<description_file>1623/2004-18.html</description_file>
-<url>1623/2004-18.html</url>
+<description_file></description_file>
+<url>1623/2004-18/index.html</url>
 </cave>
 </body>
 </html>
diff --git a/noinfo/cave_data/1623-2004-21.html b/noinfo/cave_data/1623-2004-21.html
index 9e5dcb3c0..5b191be1c 100644
--- a/noinfo/cave_data/1623-2004-21.html
+++ b/noinfo/cave_data/1623-2004-21.html
@@ -33,8 +33,8 @@
 <depth></depth>
 <extent></extent>
 <survex_file></survex_file>
-<description_file>1623/2004-21.html</description_file>
-<url>1623/2004-21.html</url>
+<description_file></description_file>
+<url>1623/2004-21/index.html</url>
 </cave>
 </body>
 </html>
diff --git a/years/2005/surfacework.html b/years/2005/surfacework.html
index 76ef3de6a..9f6924fbd 100644
--- a/years/2005/surfacework.html
+++ b/years/2005/surfacework.html
@@ -34,15 +34,15 @@ and found eight more holes which promptly got forgotten about as well. At least
 they explored most of these at the time but <a
 href="../../1623/2003-X12/2003-X12.html">2003-X12</a> and <a
 href="../../1623/2003-X17/2003-X17.html">2003-X17</a> are undescended.</li>
-<li><a href="../../1623/2004-10.html">2004-10</a>: discovered by
+<li><a href="../../1623/2004-10/index.html">2004-10</a>: discovered by
 Becka and Nial, lying just north of <a
 href="../../1623/251/251.html">251</a> (In Your Face).</li>
-<li><a href="../../1623/2004-13.html">2004-13</a>: near 161G and
+<li><a href="../../1623/2004-13/index.html">2004-13</a>: near 161G and
 161H. Almost certainly goes into Iceland if it goes anywhere, but worth
 checking out.</li>
-<li><a href="../../1623/2004-16.html">2004-16</a>, <a
-href="../../1623/2004-17.html">17</a>, <a
-href="../../1623/2004-18.html">18</a>: Martin + Frank's holes north
+<li><a href="../../1623/2004-16/index.html">2004-16</a>, <a
+href="../../1623/2004-17/index.html">17</a>, <a
+href="../../1623/2004-18/index.html">18</a>: Martin + Frank's holes north
 of 204C. Need checking out to see if they go anywhere; might yield a new 204
 entrance!</li>
 <li>2002-02 aka <a href="../../1623/234/234.html">234B</a>: has a voice and
@@ -59,7 +59,7 @@ require hammering and/or capping?</li>
 Continuing passage at the other side of Mersonified pitch-head, trending
 in direction of 204 (although not very deep); may require a bolt traverse to
 access.</li>
-<li><a href="../../1623/2004-19.html">2004-19</a> (Kindergarten):
+<li><a href="../../1623/2004-19/index.html">2004-19</a> (Kindergarten):
 pitch in floor of main passage.</li>
 <li><a href="../../1623/2002-07/2002-07.html">2002-07</a> (Quarries A-C):
 squeeze down past snow plug at -34m, just 9m above Crowning Glory.</li>
@@ -69,7 +69,7 @@ squeeze down past snow plug at -34m, just 9m above Crowning Glory.</li>
 <li><a href="../../1623/2000-08/2000-08.htm">2000-08</a>: Dig poised above
 Merry Fucking Christmas. If I can work out a sensible and safe rig to get into
 it, then I might have a go at it with a crowbar and a shovel.</li>
-<li><a href="../../1623/2004-21.html">2004-21</a>: Dig out the
+<li><a href="../../1623/2004-21/index.html">2004-21</a>: Dig out the
 mysterious passage going down to the right (which is sometimes snow-choked but
 has never been descended). Danger of attack by flying saucers. (Needs tagging,
 as well.)</li>
diff --git a/years/2006/mission.html b/years/2006/mission.html
index b3decb51b..6ae5c7546 100644
--- a/years/2006/mission.html
+++ b/years/2006/mission.html
@@ -116,9 +116,9 @@ but if 178 were found that might give us a better idea where to look.</li>
 (both tagged and photographed and bearings taken but not explored or GPSed).
 99-OB-02 must be near to being above Brave New World.</li>
 
-<li>Proper survey for <a href="../../1623/2004-01.html">2004-01 (bivi cave)</a> - trivial since it's just a large chamber.</li>
+<li>Proper survey for <a href="../../1623/2004-01/index.html">2004-01 (bivi cave)</a> - trivial since it's just a large chamber.</li>
 
-<li>Descend/explore/survey <a href="../../1623/2004-08.html">2004-08</a>.</li>
+<li>Descend/explore/survey <a href="../../1623/2004-08/index.html">2004-08</a>.</li>
 
 <li>Excavate potential entrance above Pancake Chips Aven in 76, which might
 provide an easier route in to at least some of Brave New World.</li>
@@ -129,7 +129,7 @@ provide an easier route in to at least some of Brave New World.</li>
 apparantly) and <a href="../../1623/81/81.html">81</a> (~15m long, no
 rigging gear)</li>
 
-<li>Tag and survey <a href="../../1623/2004-03.html">2004-03</a>
+<li>Tag and survey <a href="../../1623/2004-03/index.html">2004-03</a>
 (hole already drilled, not a very long cave).</li>
 
 <li><a href="../../1623/97.htm">Schneewindschacht (97)</a> probably deserves a revisit, due to its proximity to 76 and a phreatic level known to have a continuing traverse - we should at least check how bad the entrance squeeze actually is!</li>
diff --git a/years/2007/surf76.html b/years/2007/surf76.html
index 6d574e5e8..379ff5b81 100644
--- a/years/2007/surf76.html
+++ b/years/2007/surf76.html
@@ -55,8 +55,8 @@ is heading for it.</li>
 href="../../1623/2006-73.html">Ice Curtain Cave</a> with crampons or an ice
 axe (probably best done late in expo).</li>
 
-<li>Refind <a href="../../1623/2004-04.html">2004-04</a> and
-<a href="../../1623/2004-09.html">2004-09</a>
+<li>Refind <a href="../../1623/2004-04/index.html">2004-04</a> and
+<a href="../../1623/2004-09/index.html">2004-09</a>
 and surface survey, and take photos.</li>
 </ul>