From 6b8a054bc35b7a92cc7e7179a92510e1ad095125 Mon Sep 17 00:00:00 2001 From: "Philip Sargent (muscogee)" Date: Sat, 28 Mar 2020 12:30:25 +0000 Subject: [PATCH] Make names live URLs in the folk list. --- folk/{to-do => i}/benvanmillingen-Jan1982.jpg | Bin folk/l/benvm.htm | 24 +- handbook/computing/x-todo.html | 226 +++++++++--------- scripts/make-folklist.py | 18 +- 4 files changed, 149 insertions(+), 119 deletions(-) rename folk/{to-do => i}/benvanmillingen-Jan1982.jpg (100%) 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.

-

Photo © Andy Waddington, 1979

+ + +

Photo (left) © Andy Waddington, 1979

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

- -

Photos

- -

Surveys data entry

- -

Troggle

-

Expo Server

- -

- This to-do-list gadget itself -

- -
- Testing area.. -
Demonstation as initially read from disc
- - + + +

Expo Systems Exptl. To-Do List

+ + + +

Documentation

+ +

Photos

+ +

Surveys data entry

+ +

Troggle

+

Expo Server

+ +

+ This to-do-list gadget itself +

+ +
+ 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 += '' if guest: output += '§'