sed basics done for survex files in :loser:

1 files changed, 21 insertions, 5 deletions

diff --git a/templates/cave_kataster.html b/templates/cave_kataster.html
index d8d57ae..0e664c6 100644
--- a/templates/cave_kataster.html
+++ b/templates/cave_kataster.html
@@ -26,6 +26,8 @@ This cave needs to be "katastered". If you have the new number issued by the Aus
 	</button>	
 
 {% endif %}
+<div style="color:red; font-weight: bold; font-size: large">
+{{warning|safe}}</div>
 
 <h3>Rename the .html files in <var>expoweb</var></h3>
 <div style="font-family: monospace; font-weight: bold;">
@@ -35,6 +37,17 @@ This cave needs to be "katastered". If you have the new number issued by the Aus
 &nbsp;&nbsp;&nbsp;
 &rarr;
 <span style="color:grey">&lt;kataster_number&gt;</span><span style="color:blue">{{knum}}</span><span style="color:grey">&lt;/kataster_number&gt;</span> 
+
+<br />
+&nbsp;&nbsp;&nbsp;<span style="color:grey">&lt;survex_file&gt;</span>{{cave.survex_file}}
+<span style="color:grey">&lt;/survex_file&gt;</span> 
+<br />
+&nbsp;&nbsp;&nbsp;
+&rarr;
+<span style="color:grey">&lt;survex_file&gt;</span><span style="color:blue">caves-{{cave.areacode}}/{{knum}}/{{knum}}.svx</span>
+<span style="color:grey">&lt;/survex_file&gt;</span> 
+
+
 <p>
 {% for e in entrance_data %}
 {{e|safe}}</br />
@@ -65,6 +78,7 @@ This cave needs to be "katastered". If you have the new number issued by the Aus
 {% endfor %}
 </div>
 <ul style="list-style: disc">
+<li>Beware that the capitalisation of the directory name in the <var>loser</var> repo may be different from the cave name in the <var>expoweb</var> repo.
 <li> Find the survex files for this cave and edit the <samp>*include</samp> inside the survex files to use the new kataster number
 <li> find and edit the <samp>'*_station'</samp> tags in each <samp>entrance_data</samp> file and in the fixed points files in the loser repo.
 <li> Rename the survex files
@@ -82,14 +96,16 @@ This cave needs to be "katastered". If you have the new number issued by the Aus
 <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 />
 {% for e in entrances %}
-<samp>
-{{e}}.html<br />&nbsp;&nbsp;&nbsp;{% if e.tag_station%}</samp>tag_station: <samp>{{e.tag_station}}{% endif %}
-{% if e.other_station%}</samp>other_station: <samp>{{e.other_station}}{% endif %}<br /><samp>
+<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>Set the historic alias forwarder  in <var>expoweb</var></h3>
 <ul style="list-style: disc">
-<li> Add the line <br /><samp>("{{cave.slug|safe}}", "<span style="color:blue">{{cave.areacode |safe}}-{{knum}}</span>"),</samp></br /> to the end 
+<li> Add the line <br />
+<b><samp>("{{cave.slug|safe}}", "<span style="color:blue">{{cave.areacode |safe}}-{{knum}}</span>"),</samp></b></br />
+ to the end 
 of the file <var><a href="/cave_data/cavealiases.txt_edit">cave_data/cavealiases.txt</a></var> (don't forget the  comma at the end of the line)
 </ul>
 <p>This will cause lots of errors until the cave <samp>"<span style="color:blue">{{cave.areacode |safe}}-{{knum}}</span>"</samp> has been created by a full database reset OR we can do an online rename of the "Cave" object in the database [code yet to be written] by pressing this button [button not yet implemented].
@@ -120,8 +136,8 @@ OR we can do an online rename of the "Cave" object in the database [code yet to
 <h3>Ideal scenario</h3>
 <p>
 <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.
-<p>
 
+<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">
 {{script}}
 </textarea>