X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=survey%2FMakefile;h=657b92eeb828e8e03dfe38f39d9a1750793243d3;hb=43c7194b884aca8562e6b5b70a6624844548c7c6;hp=8b60230c309c5f1f5e36e377d248f0ebc593f595;hpb=70fe6254fbc16d2f417c617c86b6185e911bc8bc;p=neurodebian.git
diff --git a/survey/Makefile b/survey/Makefile
index 8b60230..657b92e 100644
--- a/survey/Makefile
+++ b/survey/Makefile
@@ -6,10 +6,11 @@ clean:
jquery.form.js:
wget --no-check-certificate http://github.com/malsup/form/raw/master/jquery.form.js
-index.html: survey.rst
- rst2html --link-stylesheet --stylesheet-path=survey.css survey.rst > $@
+#index.html: survey.rst
+index.html: closed.rst
+ rst2html --link-stylesheet --stylesheet-path=survey.css $< > $@
-results.html: results.rst
+results.html: results.rst figures/stats.txt
rst2html --link-stylesheet --stylesheet-path=survey.css results.rst > $@
results_snippet.html: results.html
@@ -18,18 +19,22 @@ results_snippet.html: results.html
| tail -n$$(echo "$$(wc -l < results.html) - $$(grep -n '' \
< results.html | cut -d ':' -f 1,1) - 2" | bc ) > $@
-statfigures: oslist.txt swlist.txt datamodlist.txt
+figures/stats.txt: statfigures
+
+statfigures: oslist.txt swlist.txt datamodlist.txt employer-dd-list.txt position-dd-list.txt ratingslist.txt vmlist.txt
# create "lockfile'
@touch $@
- @[ "$$(cat nsubmissions.stamp || true)" != "$$(ls -1 data |wc -l)" ] \
- && ls -1 data |wc -l > nsubmissions.stamp \
- && MVPA_MATPLOTLIB_BACKEND=agg ./makestats data figures || true
+ @[ "$$(cat nsubmissions.stamp 2>/dev/null || echo)" != "$$(ls -1 data |wc -l)" ] \
+ && echo "I: Re-generating stats figures" \
+ && ls -1 dataout |wc -l > nsubmissions.stamp \
+ && MVPA_MATPLOTLIB_BACKEND=agg ./makestats dataout figures || true
# remove lockfile
@-rm $@
getdata:
rsync -rvzlhp --delete \
- neurodebian@www.pymvpa.org:/home/neurodebian/surveydata .
+ neurodebian@www.pymvpa.org:/home/neurodebian/survey/data .
+ ./postprocdata
oslist.txt: select_os_options.inc
grep -v selected select_os_options.inc | sed -e 's/,: ",' \
-e 's,$$,",' -e 's/ "$$/ "Other"/' > $@
+vmlist.txt: survey.rst
+ grep virt_prod survey.rst | sed -e 's/.*,: ",' -e 's,
.*$$,,' -e 's/ "$$/ "Other VM"/' > $@
+
datamodlist.txt: survey.rst
grep '"bg_datamod"' survey.rst | sed -e 's/.*name="bg_datamod" value="//' \
-e 's," />,: ",' -e 's,
$$,",' -e 's/ "$$/ "Other"/' > $@
-upload: index.html results.html results_snippet.html jquery.form.js survey.css surveycollector.cgi
+# 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' >| $@
+
+ratingslist.txt: survey.rst
+ @echo "I: Extracting fields for ratings into $@"
+ @grep -B 6 -e 'radio.*_r.*value="3"' survey.rst \
+ | grep -v -e '^\.\. raw' -e '^[ -]*$$' -e '| $@
+
+upload: upload-closed
+
+upload-closed: index.html
+ rsync -rvzlhp --delete \
+ --exclude='*.txt' --exclude=data --exclude=figures \
+ --chmod=Dg+s,g+rw $^ neurodebian@www.pymvpa.org:/home/neurodebian/survey/
+ ssh neurodebian@www.pymvpa.org rm /srv/neuro.debian.net/cgi-bin/surveycollector.cgi
+
+upload-survey: index.html results.html results_snippet.html jquery.form.js survey.css surveycollector.cgi
rsync -rvzlhp --delete \
- --exclude='*.txt' --exclude=surveydata --exclude='*.cgi' --exclude=figures \
- --chmod=Dg+s,g+rw * neurodebian@www.pymvpa.org:/home/neurodebian/survey/
+ --exclude='*.txt' --exclude=data --exclude='*.cgi' --exclude=figures \
+ --chmod=Dg+s,g+rw $^ neurodebian@www.pymvpa.org:/home/neurodebian/survey/
scp surveycollector.cgi neurodebian@www.pymvpa.org:/srv/neuro.debian.net/cgi-bin/
+.PHONY: statfigures