Merge branch 'master' of alioth:/git/pkg-exppsy/neurodebian

* 'master' of alioth:/git/pkg-exppsy/neurodebian:
  provide human-readable descriptions for positions and employer (venue)

diff --combined survey/makestats
index 29952dea76e797060407667a728f7565f53b907e,7da486e97ba46760ec4e3beb84f5e43ad3f53964..070400b045b26f499f53eea9534b3ae4acf55d94
--- 1/survey/makestats
--- 2/survey/makestats
+++ b/survey/makestats
@@@ -101,6 -101,8 +101,8 @@@ class DB(dict)
      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
@@@ -168,7 -170,8 +170,8 @@@
  
      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]
@@@ -177,7 -180,7 +180,7 @@@
  
  
  def mkpic_os_per_env(db, destdir):
 -    envs = ['pers', 'man', 'virt', 'virt']
 +    envs = ['pers_os', 'man_os', 'virt_host_os', 'virt_guest_os']
      env_names = ['Personal', 'Managed', 'Virt. Host', 'Virt. Guest']
      env_stats = {}
      for env in envs:
@@@ -234,7 -237,7 +237,7 @@@ def mkpic_time_per_env(db, destdir)
      pl.ylim(-0.4, len(envs))
      pl.title("Research activity time by environment")
      pl.xlabel("Fraction of submissions")
 -    pl.savefig('%s/ospref_by_env.png' % destdir, format='png', dpi=80)
 +    pl.savefig('%s/time_by_env.png' % destdir, format='png', dpi=80)
  
  
  def mkpic_submissions_per_key(db, destdir, key, title, sortby='name',