From: Yaroslav Halchenko Date: Mon, 16 May 2011 16:38:05 +0000 (-0400) Subject: Merge branch 'master' of git://git.debian.org/pkg-exppsy/neurodebian X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6bd552f81fba13d383f7640f899df78232325bd0;p=neurodebian.git Merge branch 'master' of git://git.debian.org/pkg-exppsy/neurodebian * 'master' of git://git.debian.org/pkg-exppsy/neurodebian: Fix div by zero prob. Make time figure. Conflicts: survey/makestats -- in list of sources for get_nice_name --- 6bd552f81fba13d383f7640f899df78232325bd0 diff --cc survey/Makefile index ef2d8f1,9ce5fc0..e817fc8 --- a/survey/Makefile +++ b/survey/Makefile @@@ -43,15 -43,9 +43,15 @@@ datamodlist.txt: survey.rs grep '"bg_datamod"' survey.rst | sed -e 's/.*name="bg_datamod" value="//' \ -e 's," />,: ",' -e 's,
$$,",' -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=surveydata --exclude='*.cgi' --exclude=figures \ + --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/ diff --cc survey/makestats index 3829f13,09b0c94..7da486e --- a/survey/makestats +++ b/survey/makestats @@@ -162,8 -168,7 +170,8 @@@ class DB(dict) def get_nice_name(self, id): srcs = [DB.os_dict, os_cat_names, DB.sw_dict, sw_categories, - resource_categories, DB.datamod_dict, DB.position_dict, - DB.employer_dict] - 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]