From 11239c9db41aeff017d1160a982d5e1c5f751ea1 Mon Sep 17 00:00:00 2001 From: expoonserver Date: Tue, 2 Apr 2019 00:29:02 +0100 Subject: [PATCH] Move folk.csv and makefolklist.py to folk and scripts dirs respectively. (out of noinfo) --- Makefile | 4 ++-- {noinfo => folk}/folk.csv | 0 handbook/manual.html | 4 ++-- {noinfo => scripts}/make-folklist.py | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename {noinfo => folk}/folk.csv (100%) rename {noinfo => scripts}/make-folklist.py (100%) diff --git a/Makefile b/Makefile index 9723f83d8..7c91e07b8 100644 --- a/Makefile +++ b/Makefile @@ -41,8 +41,8 @@ noinfo/cavestats: folklist: folk/index.htm -folk/index.htm: noinfo/folk.csv noinfo/make-folklist.py - python noinfo/make-folklist.py < noinfo/folk.csv > folk/index.htm +folk/index.htm: folk/folk.csv scripts/make-folklist.py + python scripts/make-folklist.py < folk/folk.csv > folk/index.htm ########### diff --git a/noinfo/folk.csv b/folk/folk.csv similarity index 100% rename from noinfo/folk.csv rename to folk/folk.csv diff --git a/handbook/manual.html b/handbook/manual.html index 1c5f52c34..9c0be3cb5 100644 --- a/handbook/manual.html +++ b/handbook/manual.html @@ -252,7 +252,7 @@ superseded in 2012).

Once you have pushed your changes to the repository you need to update the server's local copies, by ssh into the server and running hg update in the expoweb folder.

Adding a new year

-

Edit noinfo/folk.csv, adding the new year to the end of the header +

Edit folk/folk.csv, adding the new year to the end of the header line, a new column, with just a comma (blank cell) for people who weren't there, a 1 for people who were there, and a -1 for people who were there but didn't go caving. Add new lines for @@ -288,7 +288,7 @@ good.

 Script location 	Input file 	Output file 	Purpose
 /svn/trunk/expoweb/noinfo/make-indxal4.pl 	/svn/trunk/expoweb/noinfo/CAVETAB2.CSV 	many 	produces all cave description pages
-/svn/trunk/expoweb/noinfo/make-folklist.py 	/svn/trunk/expoweb/noinfo/folk.csv 	http://expo.survex.com/folk/index.htm 	Table of all expo members
+/svn/trunk/expoweb/scripts/make-folklist.py 	/svn/trunk/expoweb/folk/folk.csv 	http://expo.survex.com/folk/index.htm 	Table of all expo members
 
 /svn/trunk/surveys/tablize-csv.pl /svn/trunk/surveys/tablizebyname-csv.pl
 	/svn/trunk/surveys/Surveys.csv 	
diff --git a/noinfo/make-folklist.py b/scripts/make-folklist.py
similarity index 100%
rename from noinfo/make-folklist.py
rename to scripts/make-folklist.py