And again.

diff --git a/survey/makestats b/survey/makestats
index ef1d2146f42ea2abecaccc07315f6c4d319e3fab..5dd76331a9ee8417e8c03b410f97d6dd08caacf2 100755 (executable)
--- a/survey/makestats
+++ b/survey/makestats
@@ -5,6 +5,7 @@ import json
 import sys
 import pylab as pl
 import numpy as np
+import time
 from mvpa.misc.plot.base import plot_bars
 
 # uniform colors for OS results
@@ -217,7 +218,7 @@ def mkpic_resources(db, destdir):
                 bbox=dict(facecolor='white', alpha=0.8, edgecolor='white',
                           color='white'))
     pl.ylabel('Number of submissions')
-    pl.savefig('%s/software_resources' % destdir, format='png', dpi=80)
+    pl.savefig('%s/software_resources.png' % destdir, format='png', dpi=80)
 
 def mkpic_software(db, destdir):
     for typ in sw_categories.keys():
@@ -272,6 +273,12 @@ def main(srcdir, destdir):
                        "Ratings: Managed environment")
     mkpic_rating_by_os(db, 'virt_host_os', ['virt_r%i' % i for i in range(1, 4)], destdir,
                        "Ratings: Virtual environment (by host OS)")
+    # submission stats: this is RST
+    statsfile = open('%s/stats.txt' % destdir, 'w')
+    statsfile.write('::\n\n  Number of submissions: %i\n' % len(db))
+    statsfile.write('  Statistics last updated: %s\n\n' \
+            % time.strftime('%A, %B %d %Y, %H:%M:%S UTC', time.gmtime()))
+    statsfile.close()
 
 if __name__ == '__main__':
     main(sys.argv[1], sys.argv[2])

diff --git a/survey/results.rst b/survey/results.rst
index 1d217fc7608ab2b849319382b7055363a551773f..391f0fb221b9414060e495fbe8bf6ba8242d0ddd 100644 (file)
--- a/survey/results.rst
+++ b/survey/results.rst
@@ -1,6 +1,8 @@
 Current survey results
 ----------------------
 
+.. include:: figures/stats.txt
+
 Submitter background
 ~~~~~~~~~~~~~~~~~~~~
 
@@ -20,6 +22,11 @@ Environment ratings
 .. figure:: figures/ratings_man_os.png
 .. figure:: figures/ratings_virt_host_os.png
 
+Software resources
+~~~~~~~~~~~~~~~~~~
+
+.. figure:: figures/software_resources.png
+
 Software popularity
 ~~~~~~~~~~~~~~~~~~~