| tail -n$$(echo "$$(wc -l < results.html) - $$(grep -n '<body>' \
< results.html | cut -d ':' -f 1,1) - 2" | bc ) > $@
-statfigures: oslist.txt swlist.txt datamodlist.txt
+statfigures: oslist.txt swlist.txt datamodlist.txt employer-dd-list.txt position-dd-list.txt
# create "lockfile'
@touch $@
@[ "$$(cat nsubmissions.stamp 2>/dev/null || echo)" != "$$(ls -1 data |wc -l)" ] \
grep '"bg_datamod"' survey.rst | sed -e 's/.*name="bg_datamod" value="//' \
-e 's," />,: ",' -e 's,<br />$$,",' -e 's/ "$$/ "Other"/' > $@
+# Generic rule to extract from drop-down selections
+%-dd-list.txt: survey.rst
+ @echo "I: Extracting fields for $* into $@"
+ @sed -n -e '/bg_$*/,/\/tr/p' survey.rst \
+ | sed -ne '/option/s,.*value="\([^"]*\)" *label=\("[^"]*"\)>.*,\1: \2,gp' >| $@
+
upload: index.html results.html results_snippet.html jquery.form.js survey.css surveycollector.cgi
rsync -rvzlhp --delete \
--exclude='*.txt' --exclude=data --exclude='*.cgi' --exclude=figures \
os_dict = load_list2dict('oslist.txt')
datamod_dict = load_list2dict('datamodlist.txt')
sw_dict = load_list2dict('swlist.txt')
+ position_dict = load_list2dict('position-dd-list.txt')
+ employer_dict = load_list2dict('employer-dd-list.txt')
def __init__(self, srcdir):
# eats the whole directory
def get_nice_name(self, id):
srcs = [DB.os_dict, os_cat_names, DB.sw_dict, sw_categories,
- resource_categories, time_categories, DB.datamod_dict]
+ resource_categories, time_categories,
+ DB.datamod_dict, DB.position_dict, DB.employer_dict]
for src in srcs:
if id in src:
return src[id]