3 files changed, 8 insertions, 4 deletions

diff --git a/parse/tuple_table.py b/parse/tuple_table.py
index ee94772..491ea7b 100644
--- a/parse/tuple_table.py
+++ b/parse/tuple_table.py
@@ -60,7 +60,7 @@ class ReducedTupleTable(TupleTable):
                     if not base_type in measurement:
                         continue
                     # Ex: release/num_tasks/measured-max/avg/x=5.csv
-                    leaf = self.col_map.encode(kv) + ".csv"
+                    leaf = (self.col_map.encode(kv) or "line") + ".csv"
                     path = [ stat, variable, base_type, summary_type, leaf ]
                     result = measurement[base_type]
 
diff --git a/parse_exps.py b/parse_exps.py
index ee1462c..7c75f5f 100755
--- a/parse_exps.py
+++ b/parse_exps.py
@@ -134,7 +134,7 @@ def main():
 
     sys.stderr.write("Parsing data...\n")
 
-    procs = min(len(exps), cpu_count()/2)
+    procs = min(len(exps), max(cpu_count()/2, 1))
     pool = Pool(processes=procs)
     pool_args = zip(exps, [opts.force]*len(exps))
     enum = pool.imap_unordered(parse_exp, pool_args, 1)
@@ -171,8 +171,8 @@ def main():
 
         # No csvs to write, assume user meant to print out data
         if dir_map.is_empty():
-            sys.stderr.write("Too little data to make csv files.\n")
             if not opts.verbose:
+                sys.stderr.write("Too little data to make csv files.\n")
                 for key, exp in result_table:
                     for e in exp:
                         print(e)
diff --git a/plot_exps.py b/plot_exps.py
index 49cc729..affe231 100755
--- a/plot_exps.py
+++ b/plot_exps.py
@@ -142,7 +142,11 @@ def main():
         os.mkdir(opts.out_dir)
 
     for dir in args:
-        plot_dir(dir, opts.out_dir, opts.force)
+        if len(args) > 1:
+            out_dir = "%s/%s" % (opts.out_dir, os.path.split(dir)[1])
+        else:
+            out_dir = opts.out_dir
+        plot_dir(dir, out_dir, opts.force)
 
 if __name__ == '__main__':
     main()