diff --git a/folk/to-do/benvanmillingen-Jan1982.jpg b/folk/i/benvanmillingen-Jan1982.jpg
similarity index 100%
rename from folk/to-do/benvanmillingen-Jan1982.jpg
rename to folk/i/benvanmillingen-Jan1982.jpg
diff --git a/folk/l/benvm.htm b/folk/l/benvm.htm
index 8776256db..f5a779973 100644
--- a/folk/l/benvm.htm
+++ b/folk/l/benvm.htm
@@ -1,13 +1,22 @@
-
+
-
+
CUCC Expo member: Ben van Millingen
+
+
CUCC Expedition Handbook
+
+
Ben van Millingen
+
+
+
+
+
Ben van Millingen,
Queens' 1976-79 (Tacklemaster 1978-79).
Expedition 1978, 1979, 1980, 1983.
@@ -16,10 +25,15 @@ Explored Gemsehöhle (1623/107) in
and worked in the Stellerwegsystem
(1623/41) and 1623/87 in 1980.
Wolfhöhle (1623/145) was the main
-venue in 1983.
-Photo taken in Hall of the Greene King in Eislufthöhle.
+venue in 1983.
+
+Photo (right) taken in Greenclose, New Year meet Jan. 1982.
+
+Photo (left) taken in Hall of the Greene King in Eislufthöhle.
diff --git a/handbook/computing/x-todo.html b/handbook/computing/x-todo.html
index 1c0ae13f8..35150050e 100644
--- a/handbook/computing/x-todo.html
+++ b/handbook/computing/x-todo.html
@@ -3,118 +3,118 @@
Expo Systems Exptl. To-Do List
-
-
-
Expo Systems Exptl. To-Do List
-
-
-
-
Documentation
-
-
Wallets & new-cave
-
-
Explain (in the wallets process) how to view the surveys
- online so that (1) you can see an example of how to do your new one,
- and (2) so that you can check that you have done it properly when you
- have finished.
-
Explain how to link a new cave into the other caves in
- troggle filesystem
-
-
-
Troggle architecture
-
-
Handbook: explain how troggle works - much better and simpler. Fix
- mistakes I wrote. For future system maintainers
-
Copy the .wiki material into the documentation somewhere
-
-
-
Surveyscans
-
-
explain where the image files are referenced from: svx, tunnel/therion, and why there are so many broken links
-
-
-
-
Photos
-
-
Capitalisation in filenames problem
-
-
run the duplicate filename script on the server in
- /photos/xml/ as there are files which differ only in
- capitalisation of their names.
-
Fix such duplicates in the /photos/ folders where this
- problem originates
-
Document this issue of duplicate photo filenames produced by
- multiple cameras running similar software
-
somehow fix the photo filenames which use capital letters on
- import or upload, or by a cron job
-
-
-
-
Surveys data entry
-
-
2019 surveyscans
-
-
edit all the content.json
-
try to autocomplete the content.json by parsing .svx files
-
Put personal names into canonical form
-
-
-
-
Troggle
-
Expo Server
-
-
www-data:www-data permissions
-
-
Fix permissions so that all files served by troggle have
- www-data:www-data ownership and group ownership, otherwise the
- "Edit this page" fails with a permissions error, or
-
-
Or fix group
- membership for the process running django so that it can write
- files owned by 'expo'
-
We need two of these: 1.for expo systems work (troggle & scripts) - the current priority as we have nowhere currently that Wookey is willing to use
- 2.for survey data progress/issues (though troggle itself can be used for some of this if cleaned up a bit)
-
-
-
-
Try to automate simple functions in javascript
-
-
to control this document
- in-place (tick, delete) instead of using the
- tinymce HTML editor in Django
-
Maybe restructure whole page as JSON and use
- javascript editor to create (edit), re-order and demote items. So long
- as the content is inserted into the DOM, it should work ?
-
Implement comments on an issue, mimicking GitHub issues wiki
-
Use javascript to skip over the _edit page and submit changes
- direct to server when updating
-
checkboxes so that items can be ticked
- (which also does strike-through)
-
bin icon to delete an item? Better to have an archive process.
-
-
-
-
-
- Testing area..
-
Demonstation as initially read from disc
-
-
+
+
+
Expo Systems Exptl. To-Do List
+
+
+
+
Documentation
+
+
Wallets & new-cave
+
+
Explain (in the wallets process) how to view the surveys
+ online so that (1) you can see an example of how to do your new one,
+ and (2) so that you can check that you have done it properly when you
+ have finished.
+
Explain how to link a new cave into the other caves in
+ troggle filesystem
+
+
+
Troggle architecture
+
+
Handbook: explain how troggle works - much better and simpler. Fix
+ mistakes I wrote. For future system maintainers
+
Copy the .wiki material into the documentation somewhere
+
+
+
Surveyscans
+
+
explain where the image files are referenced from: svx, tunnel/therion, and why there are so many broken links
+
+
+
+
Photos
+
+
Capitalisation in filenames problem
+
+
run the duplicate filename script on the server in
+ /photos/xml/ as there are files which differ only in
+ capitalisation of their names.
+
Fix such duplicates in the /photos/ folders where this
+ problem originates
+
Document this issue of duplicate photo filenames produced by
+ multiple cameras running similar software
+
somehow fix the photo filenames which use capital letters on
+ import or upload, or by a cron job
+
+
+
+
Surveys data entry
+
+
2019 surveyscans
+
+
edit all the content.json
+
try to autocomplete the content.json by parsing .svx files
+
Put personal names into canonical form
+
+
+
+
Troggle
+
Expo Server
+
+
www-data:www-data permissions
+
+
Fix permissions so that all files served by troggle have
+ www-data:www-data ownership and group ownership, otherwise the
+ "Edit this page" fails with a permissions error, or
+
+
Or fix group
+ membership for the process running django so that it can write
+ files owned by 'expo'
+
We need two of these: 1.for expo systems work (troggle & scripts) - the current priority as we have nowhere currently that Wookey is willing to use
+ 2.for survey data progress/issues (though troggle itself can be used for some of this if cleaned up a bit)
+
+
+
+
Try to automate simple functions in javascript
+
+
to control this document
+ in-place (tick, delete) instead of using the
+ tinymce HTML editor in Django
+
Maybe restructure whole page as JSON and use
+ javascript editor to create (edit), re-order and demote items. So long
+ as the content is inserted into the DOM, it should work ?
+
Implement comments on an issue, mimicking GitHub issues wiki
+
Use javascript to skip over the _edit page and submit changes
+ direct to server when updating
+
checkboxes so that items can be ticked
+ (which also does strike-through)
+
bin icon to delete an item? Better to have an archive process.
+
+
+
+
+
+ Testing area..
+
Demonstation as initially read from disc
+
+
diff --git a/scripts/make-folklist.py b/scripts/make-folklist.py
index c3f5effe4..b9370737b 100755
--- a/scripts/make-folklist.py
+++ b/scripts/make-folklist.py
@@ -16,6 +16,8 @@ output = ""
lines = sys.stdin.readlines()
headcounts_byyear = [0]*(len(lines[0].split(","))-5)
+
+
for r in lines[1:]:
r = r.replace("\n","")
r = r.replace("\r", "")
@@ -31,7 +33,21 @@ for r in lines[1:]:
if mug: pics +=1
output += '
'
if expos_caving == 0: output += ''
- output += name.replace('""', '"')
+
+ # Middle names still not working: MorvenBeranek-Stanley , Sarah Livia Zerbes
+ # Need to manage names e.g. Leif Hornsved (Nickname) => LeifHornsved
+ namevis = name.replace('""', '"').strip('"')
+ # Need to manage e.g.Olaf Kähler
+ # Need to manage e.g. Bal%26aacute%3BzsIzapy
+ nameurl = namevis.replace(' ', '')
+ nameurl = nameurl.replace('&', '%26')
+ nameurl = nameurl.replace(';', '%3B')
+ nameurl = re.sub('<[^>]*>','',nameurl)
+ nameurl = re.sub('\([^\)]*\)','',nameurl) # mostly noit needed, but is for Wookey
+ namelink= "" + namevis + ""
+ output += namelink
+ #output += name.replace('""', '"')
+
if expos_caving == 0: output += ''
output += '
+
+
+
Ben van Millingen,
Queens' 1976-79 (Tacklemaster 1978-79).