From 8073aca5d29d61e1291f8a4d2dba5382c91e0415 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Thu, 30 Jan 2025 20:20:20 +0000
Subject: [PATCH] more to-do

---
 core/views/cave_kataster.py  |  4 ++++
 media/css/trog3.css          |  8 ++++++++
 templates/cave_kataster.html | 25 ++++++++++++++-----------
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/core/views/cave_kataster.py b/core/views/cave_kataster.py
index dc06ea6..3c7e027 100644
--- a/core/views/cave_kataster.py
+++ b/core/views/cave_kataster.py
@@ -52,6 +52,7 @@ def kataster(request, slug):
             "form": form,
             "cave": cave,
             "cave_data": cave_data, "entrance_data": entrance_data,
+            "knum": "999",
          },
     )    
     
@@ -69,6 +70,9 @@ class KatasterForm(forms.Form):
     kataster_status = models.TextField(blank=True, null=True)
     official_name = models.CharField(max_length=160)
     survex_file = models.CharField(max_length=100, blank=True, null=True) # should be a foreign key?
+    unofficial_number = models.CharField(max_length=60, blank=True, null=True)
+    url = models.CharField(max_length=300, blank=True, null=True, unique = True)
+
 SURVEX_DATA = REPOS_ROOT_PATH / "loser"
 EXPOWEB = REPOS_ROOT_PATH / "expoweb"
 CAVEDESCRIPTIONS = EXPOWEB / "cave_data"
diff --git a/media/css/trog3.css b/media/css/trog3.css
index 3d7ab48..3ab8faa 100644
--- a/media/css/trog3.css
+++ b/media/css/trog3.css
@@ -608,6 +608,14 @@ margin-top:5px;
 margin-bottom: 5px;
 }
 
+/* added 2020-04-24 by Philip Sargent 
+# to match <code> but inline when documenting systems */
+var { 
+    font-family: monospace;
+	font-style: italic;
+    font-size: 0.9em;
+    background-color: #eee; 
+}
 
 /*The below are stolen from django admin css*/
 .addlink {
diff --git a/templates/cave_kataster.html b/templates/cave_kataster.html
index 38c8c81..532827e 100644
--- a/templates/cave_kataster.html
+++ b/templates/cave_kataster.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}Cave Kataster status report
+{% block title %}Cave re-labelling from unofficial identifier to official Kataster number
 <!-- cave_kataster.html - this text visible because this template has been included -->
 {% endblock %}
 
@@ -7,9 +7,9 @@
 
 
 
-<h2>Cave kataster status</h2>
-<h3>Cave</h3>
-<a href="/{{cave.url}}">{{cave.slug}}</a>
+<h2>Cave re-labelling from unofficial identifier to official Kataster number</h2>
+<h3>Cave '{{cave.official_name}}'</h3>
+<a href="/{{cave.url|safe}}">{{cave.slug|safe}}</a>
 
 
 <p>
@@ -21,20 +21,23 @@ This cave needs to be "katastered". If you have the new number issued by the Aus
 
 <h3>Rename the .html files</h3>
 <div style="font-family: monospace; font-weight: bold;">
-{{cave_data}}
+{{cave_data|safe}}
 <p>
 {% for e in entrance_data %}
-{{e}}</br />
+{{e|safe}}</br />
 {% endfor %}
 </div>
 
 <ul style="list-style: disc">
 <li> Rename all the files listed above
-<li> Edit the 'kataster'number' field inside the cave_data file.
-<li> Edit the 'entranceslug' field inside each 'entracne' field in the cave_data file.
-<li> Rename the directory (if it exists) inside the areacode directory, e.g. inside /1623/
-<li> Edit all the 'href=' URLS (if they exist) inside all the cave_data and entrance_data files descriptive text to refer to the new directory
-<li> Find the survex files for this cave, rename them, and edit the *include inside the survex files to use the new kataster number
+<li> Edit the '<samp>kataster'number</samp>' field inside the <samp>cave_data</samp> file.
+<li> Edit the '<samp>entranceslug</samp>' field inside each '<samp>entrance</samp>' field in the <samp>cave_data</samp> file.
+<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}}/{{knum}}/</samp> (if {{knum}} is the correct new kataster number)
+<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> Find the survex files for this cave, rename them, and edit the <samp>*include</samp> inside the survex files to use the new kataster number
+<li> Add the line "<samp>({{cave.slug|safe}}, {{cave.areacode |safe}}-{{knum}}),</samp>" to the end of the file <var>cave_data/cavealiases.txt</var>
 <li> find and report, but do not change, the '*_station' tags in each entrance_data file and in the fixed points files in the loser repo.
 </ul>
+<h3>Finally</h3>
+<p>It is then vital to do a complete databaseReset as troggle has internally indexed all those {{cave.slug}} files, the indexes are now out of date and horrible things will happen when people try to use troggle with any cave that has been altered.
 {% endblock %}