From 52bda41b564b78a8842c12f3f4632880351871b2 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Sun, 26 Jan 2025 20:28:49 +0000
Subject: [PATCH] merge 2012-OK-01 with 2017-NR-02

---
 .../i/2012-OK-01-01.JPG                       | Bin
 .../i/2012-OK-01-02.JPG                       | Bin
 .../i/2012-OK-01-03.JPG                       | Bin
 1623/{ => 2017-NR-02}/i/2017-NR-02_01.jpg     | Bin
 1623/{ => 2017-NR-02}/i/2017-NR-02_02.jpg     | Bin
 1623/{ => 2017-NR-02}/i/2017-NR-02_03.jpg     | Bin
 1623/{ => 2017-NR-02}/l/2017-NR-02_01.html    |   0
 1623/{ => 2017-NR-02}/l/2017-NR-02_02.html    |   0
 1623/{ => 2017-NR-02}/l/2017-NR-02_03.html    |   0
 .../t/2012-OK-01-01.JPG                       | Bin
 .../t/2012-OK-01-02.JPG                       | Bin
 .../t/2012-OK-01-03.JPG                       | Bin
 1623/{ => 2017-NR-02}/t/2017-NR-02_01.jpg     | Bin
 1623/{ => 2017-NR-02}/t/2017-NR-02_02.jpg     | Bin
 1623/{ => 2017-NR-02}/t/2017-NR-02_03.jpg     | Bin
 cave_data/1623-2012-OK-01.html                |  61 ------------------
 cave_data/1623-2017-NR-02.html                |   4 +-
 entrance_data/1623-2017-NR-02.html            |  23 ++++---
 18 files changed, 15 insertions(+), 73 deletions(-)
 rename 1623/{2012-OK-01 => 2017-NR-02}/i/2012-OK-01-01.JPG (100%)
 rename 1623/{2012-OK-01 => 2017-NR-02}/i/2012-OK-01-02.JPG (100%)
 rename 1623/{2012-OK-01 => 2017-NR-02}/i/2012-OK-01-03.JPG (100%)
 rename 1623/{ => 2017-NR-02}/i/2017-NR-02_01.jpg (100%)
 rename 1623/{ => 2017-NR-02}/i/2017-NR-02_02.jpg (100%)
 rename 1623/{ => 2017-NR-02}/i/2017-NR-02_03.jpg (100%)
 rename 1623/{ => 2017-NR-02}/l/2017-NR-02_01.html (100%)
 rename 1623/{ => 2017-NR-02}/l/2017-NR-02_02.html (100%)
 rename 1623/{ => 2017-NR-02}/l/2017-NR-02_03.html (100%)
 rename 1623/{2012-OK-01 => 2017-NR-02}/t/2012-OK-01-01.JPG (100%)
 rename 1623/{2012-OK-01 => 2017-NR-02}/t/2012-OK-01-02.JPG (100%)
 rename 1623/{2012-OK-01 => 2017-NR-02}/t/2012-OK-01-03.JPG (100%)
 rename 1623/{ => 2017-NR-02}/t/2017-NR-02_01.jpg (100%)
 rename 1623/{ => 2017-NR-02}/t/2017-NR-02_02.jpg (100%)
 rename 1623/{ => 2017-NR-02}/t/2017-NR-02_03.jpg (100%)
 delete mode 100644 cave_data/1623-2012-OK-01.html

diff --git a/1623/2012-OK-01/i/2012-OK-01-01.JPG b/1623/2017-NR-02/i/2012-OK-01-01.JPG
similarity index 100%
rename from 1623/2012-OK-01/i/2012-OK-01-01.JPG
rename to 1623/2017-NR-02/i/2012-OK-01-01.JPG
diff --git a/1623/2012-OK-01/i/2012-OK-01-02.JPG b/1623/2017-NR-02/i/2012-OK-01-02.JPG
similarity index 100%
rename from 1623/2012-OK-01/i/2012-OK-01-02.JPG
rename to 1623/2017-NR-02/i/2012-OK-01-02.JPG
diff --git a/1623/2012-OK-01/i/2012-OK-01-03.JPG b/1623/2017-NR-02/i/2012-OK-01-03.JPG
similarity index 100%
rename from 1623/2012-OK-01/i/2012-OK-01-03.JPG
rename to 1623/2017-NR-02/i/2012-OK-01-03.JPG
diff --git a/1623/i/2017-NR-02_01.jpg b/1623/2017-NR-02/i/2017-NR-02_01.jpg
similarity index 100%
rename from 1623/i/2017-NR-02_01.jpg
rename to 1623/2017-NR-02/i/2017-NR-02_01.jpg
diff --git a/1623/i/2017-NR-02_02.jpg b/1623/2017-NR-02/i/2017-NR-02_02.jpg
similarity index 100%
rename from 1623/i/2017-NR-02_02.jpg
rename to 1623/2017-NR-02/i/2017-NR-02_02.jpg
diff --git a/1623/i/2017-NR-02_03.jpg b/1623/2017-NR-02/i/2017-NR-02_03.jpg
similarity index 100%
rename from 1623/i/2017-NR-02_03.jpg
rename to 1623/2017-NR-02/i/2017-NR-02_03.jpg
diff --git a/1623/l/2017-NR-02_01.html b/1623/2017-NR-02/l/2017-NR-02_01.html
similarity index 100%
rename from 1623/l/2017-NR-02_01.html
rename to 1623/2017-NR-02/l/2017-NR-02_01.html
diff --git a/1623/l/2017-NR-02_02.html b/1623/2017-NR-02/l/2017-NR-02_02.html
similarity index 100%
rename from 1623/l/2017-NR-02_02.html
rename to 1623/2017-NR-02/l/2017-NR-02_02.html
diff --git a/1623/l/2017-NR-02_03.html b/1623/2017-NR-02/l/2017-NR-02_03.html
similarity index 100%
rename from 1623/l/2017-NR-02_03.html
rename to 1623/2017-NR-02/l/2017-NR-02_03.html
diff --git a/1623/2012-OK-01/t/2012-OK-01-01.JPG b/1623/2017-NR-02/t/2012-OK-01-01.JPG
similarity index 100%
rename from 1623/2012-OK-01/t/2012-OK-01-01.JPG
rename to 1623/2017-NR-02/t/2012-OK-01-01.JPG
diff --git a/1623/2012-OK-01/t/2012-OK-01-02.JPG b/1623/2017-NR-02/t/2012-OK-01-02.JPG
similarity index 100%
rename from 1623/2012-OK-01/t/2012-OK-01-02.JPG
rename to 1623/2017-NR-02/t/2012-OK-01-02.JPG
diff --git a/1623/2012-OK-01/t/2012-OK-01-03.JPG b/1623/2017-NR-02/t/2012-OK-01-03.JPG
similarity index 100%
rename from 1623/2012-OK-01/t/2012-OK-01-03.JPG
rename to 1623/2017-NR-02/t/2012-OK-01-03.JPG
diff --git a/1623/t/2017-NR-02_01.jpg b/1623/2017-NR-02/t/2017-NR-02_01.jpg
similarity index 100%
rename from 1623/t/2017-NR-02_01.jpg
rename to 1623/2017-NR-02/t/2017-NR-02_01.jpg
diff --git a/1623/t/2017-NR-02_02.jpg b/1623/2017-NR-02/t/2017-NR-02_02.jpg
similarity index 100%
rename from 1623/t/2017-NR-02_02.jpg
rename to 1623/2017-NR-02/t/2017-NR-02_02.jpg
diff --git a/1623/t/2017-NR-02_03.jpg b/1623/2017-NR-02/t/2017-NR-02_03.jpg
similarity index 100%
rename from 1623/t/2017-NR-02_03.jpg
rename to 1623/2017-NR-02/t/2017-NR-02_03.jpg
diff --git a/cave_data/1623-2012-OK-01.html b/cave_data/1623-2012-OK-01.html
deleted file mode 100644
index 993832bc4..000000000
--- a/cave_data/1623-2012-OK-01.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<!-- This file is generated by troggle on Aug. 9, 2024, 3:05 a.m. UTC using the form documented at /handbook/survey/caveentry.html -->
-<!-- Only put one cave in this file -->
-<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
-make sure you update the database by doing a full data import. If you edit it using the online form
-though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<b>This file is generated by troggle</b> on Aug. 9, 2024, 3:05 a.m. UTC using the form documented at
-the form documented at 
-<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
-<br>
-
-<cave>
-<non_public>False</non_public><!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
-<!--<caveslug></caveslug>--> <!-- Ignored. No longer required, we use the filename instead e.g. 1623-315 for 1623-315.html  -->
-<official_name></official_name><!-- Name of the cave (normally in German)  Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code>-</kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
-
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2012-OK-01</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-2012-OK-01</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. Must match the entranceslug ID.  -->
-</entrance>
-
-<explorers>Olaf Kähler, Wookey</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. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>Undescended entrance is in the northwestern corner of a small depression. It has an entrance shaft of about 25m, estimated from stones rattling down the pitch.
-Turns out (from 2024 re-visit) this cave actually got explored and tagged as <a href="/1623/2017-NR-02/2017-NR-02.html">2017-NR-02</a>, so these two entries need combining.</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment>Needs bolting kit and about 30m rope.</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost, and whether a kataster form has been sent to Austria for this cave -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
-<extent></extent>
-
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-</cave>
-</body>
-</html>
diff --git a/cave_data/1623-2017-NR-02.html b/cave_data/1623-2017-NR-02.html
index 3c6173ff4..44c672fae 100644
--- a/cave_data/1623-2017-NR-02.html
+++ b/cave_data/1623-2017-NR-02.html
@@ -29,7 +29,7 @@ the form documented at
   <letter></letter>
 </entrance>
 
-<explorers>Philip Withnall, Nadia</explorers>
+<explorers>Philip Withnall, Nadia - originally discovered in 2012 by Olaf Kähler and Wookey who said:"Undescended entrance is in the northwestern corner of a small depression. It has an entrance shaft of about 25m, estimated from stones rattling down the pitch."</explorers>
 <survex_file></survex_file>
 <underground_description>a 20m pitch which crapped out in 2 tight directions at the bottom 
 Tagged, notes and photos taken. Says logbook (Philip Withnall). 
@@ -40,7 +40,7 @@ QM C "looks like it gets smaller and craps out after a while, body-sized phreati
 <references><a href="/walletedit/2017:09">2017#09</a> 
 , see also notes in <a href="/logbookedit/2017-07-22a">22 July logbook</a>,</references>
 <survey></survey>
-<notes><a href='/1623/l/2017-NR-02_03.html'><img src='/1623/t/2017-NR-02_03.jpg' /></a><br>
+<notes><a href='/1623/2017-NR-02/l/2017-NR-02_03.html'><img src='/1623/2017-NR-02/i/2017-NR-02_03.jpg'width=40% /></a><br>
 pitch below small ceiling underneath a small downclimb on the cairned path. on the edge of a depression ~10m away from a snow plug.
 <p>
 
diff --git a/entrance_data/1623-2017-NR-02.html b/entrance_data/1623-2017-NR-02.html
index d629363b3..51cfb3a2e 100644
--- a/entrance_data/1623-2017-NR-02.html
+++ b/entrance_data/1623-2017-NR-02.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Oct. 20, 2023, 10:15 a.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle  using the form documented at handbook/survey/ententry.html -->
 <!-- If you edit this file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
@@ -14,22 +14,26 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 20, 2023, 10:15 a.m. UTC using the form documented at 
+<b>This file is generated by troggle</b>  using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
 <non_public>False</non_public>
- <!-- <slug> ignored, not needed. Now using filename -->
- <!-- <slug> ignored, not needed. Now using filename -->
+<slug>1623-2017-NR-02</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
-<map_description></map_description>
 <location_description></location_description>
 <lastvisit></lastvisit>
-<approach></approach>
+<approach>On the plateau between Augsteck and Niederes Augsteck.</approach>
 <underground_description></underground_description>
-<photo><a href='/1623/l/2017-NR-02_01.html'><img src='/1623/t/2017-NR-02_01.jpg' /></a>&nbsp;<a href='/1623/l/2017-NR-02_02.html'><img src='/1623/t/2017-NR-02_02.jpg' /></a></photo>
+<photo>2017 photos:<br/>
+<a href='/1623/2017-NR-02/l/2017-NR-02_01.html'><img src='/1623/2017-NR-02/i/2017-NR-02_01.jpg' width=30% /></a>&nbsp;<a href='/1623/2017-NR-02/l/2017-NR-02_02.html'><img src='/1623/2017-NR-02/i/2017-NR-02_02.jpg'  width=30% /></a>
+<br />
+2012 photos:<br/>
+<A href="i/2012-OK-01-01.JPG"><IMG src="t/2012-OK-01-01.JPG" /></A>&nbsp;
+<A href="i/2012-OK-01-02.JPG"><IMG src="t/2012-OK-01-02.JPG" /></A>&nbsp;
+<A href="i/2012-OK-01-03.JPG"><IMG src="t/2012-OK-01-03.JPG" /></A><BR/><BR/></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
@@ -40,7 +44,7 @@ though, you do not need to do a data import as it happens automatically -->
                       U  = Unmarked,
                       ?  = Unknown" -->
 <marking>T</marking> 
-<marking_comment></marking_comment>
+<marking_comment>We are discarding the GPS location that Olaf recorded 1623.p2012-ok-01 in favour of 1623.p2017-nr-02 which (a) very close and (b) presumably on the tag.</marking_comment>
 <!-- findability options: ? = To be confirmed ...,
                           S = Surveyed,
                           L = Lost,
@@ -53,8 +57,7 @@ though, you do not need to do a data import as it happens automatically -->
 <tag_station>1623.p2017-nr-02</tag_station>
 <other_station></other_station>
 <other_description></other_description>
-<bearings></bearings>
-<url></url>
+<bearings></bearings> <!-- this is now read-only and not editable on the forms-->
 </entrance>
 </body>
 </html>