nearly done

1 files changed, 42 insertions, 4 deletions

diff --git a/templates/cave_kataster.html b/templates/cave_kataster.html
index 0e664c6..19a1480 100644
--- a/templates/cave_kataster.html
+++ b/templates/cave_kataster.html
@@ -63,6 +63,8 @@ This cave needs to be "katastered". If you have the new number issued by the Aus
 </ul>
 
 <h3>Rename the cave description directory in <var>expoweb</var></h3>
+[ TO DO ]
+<p>
 <ul style="list-style: disc">
 <li> Edit all the '<samp>href=</samp>' <small>URLS</small> (if they exist) inside all the <samp>cave_data</samp> and <samp>entrance_data</samp> files descriptive text to refer to the new directory
 <li> Rename the directory (if it exists) inside the areacode directory, e.g. rename <samp>/{{cave.areacode}}/{{cave.unofficial_number}}/</samp> as <samp>/{{cave.areacode}}/<span style="color:blue">{{knum}}</span>/</samp> (if <span style="color:blue">{{knum}}</span> is the correct new kataster number). Do this last.
@@ -85,22 +87,57 @@ This cave needs to be "katastered". If you have the new number issued by the Aus
 <li> Run <samp>'cavern caves-{{cave.areacode |safe}}/<span style="color:blue">{{knum}}/{{knum}}.svx</span>'</samp> and check it all works as you hope
 <li> Run <samp>'cavern caves-{{cave.areacode |safe}}/caves.svx' </samp>  and check it all works as you hope
 </ul>
+Here are all the survex files which are involved with this cave, the first one on this list should be the same as the one shown above. Any others will need fixing manually:<br />
+<samp>{% for svx in cave.survexfile_set.all %}
+{{svx}}.svx<br />
+{%endfor %}
+</samp>
 
 
 <h3>Sort out the *fix point(s) in both <var>loser</var> and in <var>expoweb</var></h3>
 <ul style="list-style: disc">
-<li> Find the *fix point for each entrance (one or more in each <samp>entrance_data</samp> file) in <var>expoweb</var>. There are two fields on an Entrance where there might be a location: <samp>'tag_station', or <samp>'other_station'</samp>. These refer to a survex survey point, which might be *fix elsewhere or one of the survey points in one of the cave survex files.
-<li> Change the name of each *fix point in the relevant survex file in  <var>loser</var> 
-<li> Make the same name change(s) in each entrance file (in each <samp>entrance_data</samp> file) in <var>expoweb</var>
+<li> Find the survex station point for each entrance (one or more in each <samp>entrance_data</samp> file) in <var>expoweb</var>. There are two fields on an Entrance where there might be a location: <samp>'tag_station'</samp>, or <samp>'other_station'</samp>. These refer to a survex survey point, which might be *fix elsewhere or one of the survey points in one of the cave survex files.
+<li> Change the name of each survex point in the relevant survex file in  <var>loser</var> (usually done by renaming the <samp>*begin/*end</samp> block
+and patching any <samp>*equate</samp> statements)
+<li> Make the same name change(s) in each entrance (i.e. in each <samp>entrance_data</samp> file) in <var>expoweb</var>
 </ul>
 <p>Without fully parsing the entire survex *include tree (which this code does not do), it is impossible to find the *fix declaration file from the <samp>'station'</samp> fields in the entrance_data files. However in area 1623 we conventionally store the *fix in a "known" place. This does not work for area 1626.
 <p>Edit these Entrance files:<br />
+[ TO DO ]<p>
 {% for e in entrances %}
 <b><samp>
 entrance_data/{{e}}.html{% if e.tag_station%}</samp><br />&nbsp;&nbsp;&nbsp;</b>tag_station:<b> <samp>{{e.tag_station}}{% endif %}
 {% if e.other_station%}</samp><br />&nbsp;&nbsp;&nbsp;</b>other_station:<b> <samp>{{e.other_station}}{% endif %}<br /><samp></b>
 {% endfor %}
 
+
+<h3>Check the wallet links to survex files in <var>drawings</var></h3>
+<p>
+Edit these Wallet files <br><b><samp>
+<ul style="list-style: disc">
+{% for w in cave.wallets.all %}
+<li><a href="{{w.get_url}}">{{w.walletname}}</a> : </b>survex files<b> {{w.survexfiles}}
+{%endfor %}
+</ul>
+</samp></b>
+
+and if any of them are any of these survex files:<br />
+<samp>
+{% for svx in cave.survexfile_set.all %}
+{{svx}}.svx<br />
+{%endfor %}
+</samp>
+then the wallet needs editing: do this online  (click on the wallet id link above) <em>before</em> you run any of the katastering script. Doing it online will also do all the git commit stuff for you.
+
+<p>If doing this manually, it is <b>much</b> easier to do this using the online wallet edit form than to mess with the raw format of the JSON files, which we never touch and so will be unfamiliar to everyone.
+<!--
+<div style="margin-left: 5em;">Explanation: wallets store their data in JSON files in <samp><var>drawings</var>/walletsjson/&lt;year&gt;/&lt;walletid&gt;/contents.json</samp>, like this for wallet 2024#15:<code><pre>"survex file": [
+  "caves-1623/2015-dl-01/2015-dl-01",
+  "caves-1623/2024-jc-01/2024-jc-01"
+ ],
+</pre></code>
+</div>
+-->
 <h3>Set the historic alias forwarder  in <var>expoweb</var></h3>
 <ul style="list-style: disc">
 <li> Add the line <br />
@@ -138,9 +175,10 @@ OR we can do an online rename of the "Cave" object in the database [code yet to
 <p>Ideally you do this renumbering on a standalone instance of troggle running on a <var> &#9874; <a href="/handbook/troggle/troglaptop.html">troggle development laptop</a></var> and you don't push any of the git commits to the server until you have got all the niggles out of the conversion, i.e. the databaseReset runs locally without any warnings or errors introduced by your renaming <em>and</em> 'cavern' runs without any new survex errors.
 
 <h3>Copy this script and edit it to match the directory names on your PC</h3>
-<textarea id="script" name="script" rows="{{rows}}" cols="100" style="font-size:small; font-weight: bold; background-color: LemonChiffon">
+<textarea id="script" name="script" rows="{{rows}}" cols="110" style="font-size:small; font-weight: bold; background-color: LemonChiffon">
 {{script}}
 </textarea>
+
 <br />
 <!-- duplicate button at bottom of long page -->
 	<button  class="fancybutton"  style="padding: 0.5em 25px; font-size: 100%;" type = "submit" >