From: Yaroslav Halchenko <debian@onerussian.com>
Date: Mon, 16 May 2011 14:47:53 +0000 (-0400)
Subject: minor fixes to get stats build from "clean page"
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c385bd31002f07abe7eae07bac0308d4302de851;p=neurodebian.git

minor fixes to get stats build from "clean page"
---

diff --git a/survey/Makefile b/survey/Makefile
index 5dc7f7b..31ee5e1 100644
--- a/survey/Makefile
+++ b/survey/Makefile
@@ -21,7 +21,7 @@ results_snippet.html: results.html
 statfigures: oslist.txt swlist.txt datamodlist.txt
 # create "lockfile'
 	@touch $@
-	@[ "$$(cat nsubmissions.stamp || true)" != "$$(ls -1 data |wc -l)" ] \
+	@[ "$$(cat nsubmissions.stamp 2>/dev/null || echo)" != "$$(ls -1 data |wc -l)" ] \
 		&& ls -1 data |wc -l > nsubmissions.stamp \
 		&& MVPA_MATPLOTLIB_BACKEND=agg ./makestats data figures || true
 # remove lockfile
@@ -29,7 +29,7 @@ statfigures: oslist.txt swlist.txt datamodlist.txt
 
 getdata:
 	rsync -rvzlhp --delete \
-		neurodebian@www.pymvpa.org:/home/neurodebian/surveydata .
+		neurodebian@www.pymvpa.org:/home/neurodebian/survey/data .
 
 oslist.txt: select_os_options.inc
 	grep -v selected select_os_options.inc | sed -e 's/<option value="//' \
diff --git a/survey/makestats b/survey/makestats
index 4ca6abc..cb71fc2 100755
--- a/survey/makestats
+++ b/survey/makestats
@@ -10,7 +10,7 @@ except ImportError:
     from json import read as jread
     def jsonload(f):
         return jread(f.read())
-import sys
+import sys, os
 import pylab as pl
 import numpy as np
 import time
@@ -75,8 +75,8 @@ os_family = {
 # end the reverse mapping
 os_family_rev = {}
 for ost in os_family:
-    for os in os_family[ost]:
-        os_family_rev[os] = ost
+    for os_ in os_family[ost]:
+        os_family_rev[os_] = ost
 
 
 def load_list2dict(name):
@@ -269,6 +269,7 @@ def mkpic_rating_by_os(db, env, items, destdir, title):
 
 def main(srcdir, destdir):
     db = DB(srcdir)
+    os.makedirs(destdir)
     for pic in [mkpic_submissions_per_datamod, mkpic_os_per_env, mkpic_software,
                 mkpic_resources]:
         pic(db, destdir)