From 64f89be6a92da1fffe1a6206bebfe1cf8f735668 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Sat, 6 Nov 2021 23:57:51 +0200
Subject: [PATCH] docm .3d file generation for CaveView

---
 parsers/survex.py   | 6 +++++-
 templates/cave.html | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/parsers/survex.py b/parsers/survex.py
index 67596bf..9662b54 100644
--- a/parsers/survex.py
+++ b/parsers/survex.py
@@ -31,6 +31,8 @@ todo = '''Also walk the entire tree in the :loser: repo looking for unconnected
         you will see than have the team members are recognised by this parser, but not recognised by the
         wider troggle system (the name is not a hyperlink) - apparently randomly. 
         GetPersonExpeditionNameLookup() needs to be fixed.
+        
+- fix THREEDCACHEDIR and put .3d files in same folder as .svx and fix CaveView
 '''
 survexblockroot = None
 ROOTBLOCK = "rootblock"
@@ -1161,7 +1163,9 @@ class LoadingSurvex():
 
         def runcavern():
             '''This assumes all survex files have unique names and they are taken from many folders but the output is all put 
-            into the same folder. A serius potential bug. We should check uniquness
+            into the same folder. A serious potential bug. Import parser checks uniqueness but much better not to do it like this.
+            # see design docum in troggle/templates/cave.html
+            # and views/caves.py rendercave()
             '''
             print(" -  Regenerating stale (or chaos-monkeyed) cavern .log and .3d for '{}'\n     at '{}'\n     days svx old: {:.1f}  cav:{:.1f}   log old: {:.1f}".format(fullpath, logpath, (svx_t - log_t)/(24*3600), (cav_t - log_t)/(24*3600), (now - log_t)/(24*3600)))
             #print(f'  -  cav_t: {cav_t/(24*3600)} -  log_t: {log_t/(24*3600)} -   svx_t: {svx_t/(24*3600)} -   now: {now}')
diff --git a/templates/cave.html b/templates/cave.html
index 523c2a6..e7e89ba 100644
--- a/templates/cave.html
+++ b/templates/cave.html
@@ -440,7 +440,6 @@ div#scene {
 
 
 <script type="text/javascript" >
-
     function onLoad () {
 
         // display the user interface - and a blank canvas
@@ -455,7 +454,8 @@ div#scene {
         // Note the special code in views.caves.py to do this. The appropriate .svx/.3d file may not be simply the cave name +.3d
         CV.UI.loadCave('{{svx3d}}.3d');
     }
-        window.onload = onLoad;
+    // comment out loading CaveView until we have fixed everything
+    //    window.onload = onLoad;
 </script>
 {% endif %} <!-- all the above only loads if cave.survex_file is not empty-->
 {% endblock %}
@@ -524,6 +524,7 @@ div#scene {
 {% endif %}
 {% if cave.survex_file %}
     <h2>Survex File</h2>
+    <p><a href="https://aardgoose.github.io/CaveView.js/">CaveView</a> display of the .3d file is temporarily disabled while we fix things (Nov.2021). See <a href="/handbook/computing/todo.html">/handbook/computing/todo.html</a>.
     <a href="/survexfile">All survex files</a> &nbsp;&nbsp;&nbsp;
     <a href="{% if cave.kataster_number %}{% url "cave3d" cave.kataster_number %}{% else %}{% url "cave3d" cave.unofficial_number %}{% endif %}">3d file download</a>&nbsp;&nbsp;&nbsp;
     <a href="{% url "svx" svxstem %}">This survex file</a> &nbsp;&nbsp;&nbsp;