From f88ba3e6debd257673c07bfdd97a732afd1b5440 Mon Sep 17 00:00:00 2001
From: "Philip Sargent  (muscogee)" <philip.sargent@gmail.com>
Date: Tue, 31 Mar 2020 23:54:37 +0100
Subject: [PATCH] trying to fix people import so that troggle generated pages
 have mugshots

---
 folk/README                                   |  26 ++++++++++++++++++
 folk/folk.csv                                 |   6 ++--
 .../i/{adamaldridge2018.jpg => adama2018.jpg} | Bin
 folk/l/{juliettnash.html => juliettenash.htm} |   0
 ...michaelsargent.html => michaelsargent.htm} |   0
 folk/l/pms.htm                                |   4 +--
 6 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 folk/README
 rename folk/i/{adamaldridge2018.jpg => adama2018.jpg} (100%)
 rename folk/l/{juliettnash.html => juliettenash.htm} (100%)
 rename folk/l/{michaelsargent.html => michaelsargent.htm} (100%)
diff --git a/folk/README b/folk/README
new file mode 100644
index 000000000..47d9078d8
--- /dev/null
+++ b/folk/README
@@ -0,0 +1,26 @@
+Convert the folk.csv to fold/index.htm like this:
+$ cd :expoweb:/folk
+$ python ../scripts/make-folklist.py <folk.csv >index.htm
+
+Troggle *also* reads the mugshot and blurb about each person.
+It reads it direct from folk.csv
+
+Troggle generates its own blurb about each person.
+A link to this troggle page has been added to folk/index.htm by
+editing the script.
+
+Troggle scans the blurb and looks for everything between <body> and <hr
+to find the text of the blurb
+(see ::troggle::/parsers/people.py)
+
+All the blurb files have to be .htm - ,html is not recognised by people.py
+and trying to fix this breaks something else.
+
+There seems to be a problem with importing blrubs with more than one image file, even those the code
+in people.py only looks for the first image file
+Anyway, 
+http://127.0.0.1:8000/person/MichaelSargent doesn't have the blurb
+whereas
+http://127.0.0.1:8000/person/PhilipSargent does have the blurb.
+
+But neither has even one mugshot.
diff --git a/folk/folk.csv b/folk/folk.csv
index 2ec766c8b..8c364b79d 100644
--- a/folk/folk.csv
+++ b/folk/folk.csv
@@ -1,7 +1,7 @@
 Name,Lastname,Guest,VfHO member,Mugshot,1976,1977,1978,1979,1980,1981,1982,1983,1984,1985,1986,1987,1988,1989,1990,1991,1992,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
 Hugh Adams,Adams,,,,,,,,,,,,,,,,,,,,,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,
 Rob Adams (Robert),Adams,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,,1,,,,,,
-Adam Aldridge,Aldridge,1,,i/adamaldridge2018.jpg,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,,
+Adam Aldridge,Aldridge,1,,i/adama2018.jpg,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,,
 Michael Allen,Allen,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,
 Craig Anderson,Anderson,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,
 Gunilla Andr&eacute;e,Andr&eacute;e,,,l/andree.htm,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,
@@ -207,7 +207,7 @@ Jenny Moss,Moss,,,l/jennymoss.htm,,,,,,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 Chantalle Mouwer,Mouwer,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,
 Richard Mundy,Mundy,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,
 Phil Murphy,Murphy,1,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Juliette Nash,Nash,,,l/juliettenash.html,,,,,,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Juliette Nash,Nash,,,l/juliettenash.htm,,,,,,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 Viz Neogi,Neogi,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,
 George North,North,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,
 Elaine Oliver,Oliver,,,i/elaine.jpg,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,,,
@@ -249,7 +249,7 @@ Tony Rooke,Rooke,,,l/tonyr.htm,,,,,,,,,,,,,,,1,1,1,,,,1,1,,1,1,1,1,1,1,1,,-1,1,1
 Todd Rye,Rye,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,
 Martin Sabry,Sabry,1,,i/msabry.jpg,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,
 Hugh Salter,Salter,,,l/hughs.htm,,,,,,,,,,,,,1,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Michael Sargent (Mike),Sargent,,,l/michaelsargent.html,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,1,1,
+Michael Sargent (Mike),Sargent,,,l/michaelsargent.htm,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,1,1,
 Philip Sargent (Phil),Sargent,,,l/pms.htm,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,
 Haydon Saunders,Saunders,1,,i/hayden.jpg,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,,
 Tanya Savage,Savage,,,l/tanya.htm,,,,,,,,,,,,,,1,1,1,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,
diff --git a/folk/i/adamaldridge2018.jpg b/folk/i/adama2018.jpg
similarity index 100%
rename from folk/i/adamaldridge2018.jpg
rename to folk/i/adama2018.jpg
diff --git a/folk/l/juliettnash.html b/folk/l/juliettenash.htm
similarity index 100%
rename from folk/l/juliettnash.html
rename to folk/l/juliettenash.htm
diff --git a/folk/l/michaelsargent.html b/folk/l/michaelsargent.htm
similarity index 100%
rename from folk/l/michaelsargent.html
rename to folk/l/michaelsargent.htm
diff --git a/folk/l/pms.htm b/folk/l/pms.htm
index 1c56b6b41..05ae843d2 100644
--- a/folk/l/pms.htm
+++ b/folk/l/pms.htm
@@ -21,10 +21,8 @@ up caving seriously with CUCC in 1980 after having returned from a one-year post
 This was despite having enjoyed the delights of P8 in claggies when he was a fresher in 1972.
 <p>Father of Michael (expos 2014-2017)</P>
 
+<p class="caption">Photo &copy; Brian Derby (with OUCC in N.Ireland)</p>
 
-<hr style="clear: both" /><p class="caption">Photo &copy; Brian Derby (with OUCC in N.Ireland)</p>
-<!-- Photo  -->
-<hr />
 <!-- LINKS -->
 <ul id="links">
 <li>Back to table of <a href="../index.htm">expo members</a></li>
