From e64af8fb87d55fb01d051e7eadf8312398b81d44 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Tue, 17 Oct 2023 17:42:45 +0100
Subject: [PATCH] Online edit of entrance 1623-106

---
 cave_data/1623-106.html     | 20 ++++++++++++++------
 entrance_data/1623-106.html | 35 ++++++++++++++++++++++-------------
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/cave_data/1623-106.html b/cave_data/1623-106.html
index be889411f..54bbf42b5 100644
--- a/cave_data/1623-106.html
+++ b/cave_data/1623-106.html
@@ -1,19 +1,25 @@
 <!DOCTYPE html>
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 17, 2023, 5:42 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-000.html file by hand, make sure you update the database by doing a full data import -->
+<!-- If you edit this 1623-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 Oct. 17, 2023, 5:42 p.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>1623-106</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
-<official_name>Eislufth&ouml;hle(106)</official_name><!-- Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck--><!-- Name of the cave (normally in German) -->
-<area>1623</area><!-- Name of the cave (normally in German) -->
-<area>1d</area><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<official_name>Eislufth&ouml;hle(106)</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
 
@@ -34,10 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-106</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-106+1623-106 'Z' == -->
   <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></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></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></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. -->
@@ -50,7 +58,7 @@ Austrian Kataster numbering once the confusion was discovered. So 106 and 76 are
 <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>
-<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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
 <url>1623/106/index.htm</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
 </cave>
diff --git a/entrance_data/1623-106.html b/entrance_data/1623-106.html
index 902079db0..1a84400ae 100644
--- a/entrance_data/1623-106.html
+++ b/entrance_data/1623-106.html
@@ -1,21 +1,31 @@
-<!DOCTYPE html><!-- THIS IS INFO FOR ONE ENTRANCE-->
-<!-- Only put one entrance in this file - if this cave has multiple entrances they are each given a letter and each entrance has a separate file-->
-<!-- If you edit this file, make sure it is uploaded (pushed) to the expoweb repository (entrances folder) and that you have added the cave it enters into the caves folder-->
+<!DOCTYPE html>
+<!-- Only put one entrance in this file -->
+<!-- This file is generated by troggle on Oct. 17, 2023, 5:42 p.m. UTC 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 -->
+
+    <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
+    <!-- there is 1 required field: slug. The entrance will not appear without that. -->
+    <!-- ALWAYS use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
+
 <html lang="en">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title></title>
-<link rel="stylesheet" type="text/css" href="/css/main2.css" />
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b> on Oct. 17, 2023, 5:42 p.m. UTC using the form documented at 
+<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
+<br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-106</slug>
+<slug>1623-106</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>
 <underground_description></underground_description>
 <photo><p><div class="centre"></div></p></photo>
@@ -28,7 +38,7 @@
                       S? = Spit (?),
                       U  = Unmarked,
                       ?  = Unknown" -->
-<marking></marking> 
+<marking>U</marking> 
 <marking_comment></marking_comment>
 <!-- findability options: ? = To be confirmed ...,
                           S = Surveyed,
@@ -37,14 +47,13 @@
 <findability>S</findability>
 <findability_description></findability_description>
 <alt></alt>
-<northing></northing>
-<easting></easting> 
-<tag_station></tag_station>
-<exact_station></exact_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p76</tag_station>
 <other_station></other_station>
 <other_description></other_description>
 <bearings></bearings>
 <url></url>
 </entrance>
 </body>
-</html>
\ No newline at end of file
+</html>