diff options
Diffstat (limited to 'parse/dir_map.py')
-rw-r--r-- | parse/dir_map.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/parse/dir_map.py b/parse/dir_map.py index 6e959f2..319a5de 100644 --- a/parse/dir_map.py +++ b/parse/dir_map.py | |||
@@ -15,7 +15,7 @@ class DirMap(object): | |||
15 | for key in sorted(vals.keys()): | 15 | for key in sorted(vals.keys()): |
16 | val_strs += ["%s=%s" % (key, vals[key])] | 16 | val_strs += ["%s=%s" % (key, vals[key])] |
17 | return "%s.csv" % ("_".join(val_strs)) | 17 | return "%s.csv" % ("_".join(val_strs)) |
18 | 18 | ||
19 | def __init__(self, out_dir): | 19 | def __init__(self, out_dir): |
20 | self.root = TreeNode(None) | 20 | self.root = TreeNode(None) |
21 | self.out_dir = out_dir | 21 | self.out_dir = out_dir |
@@ -49,8 +49,6 @@ class DirMap(object): | |||
49 | 49 | ||
50 | self.__update_node(path, keys, (vary_value, result)) | 50 | self.__update_node(path, keys, (vary_value, result)) |
51 | 51 | ||
52 | |||
53 | |||
54 | def reduce(self): | 52 | def reduce(self): |
55 | def reduce2(node): | 53 | def reduce2(node): |
56 | for key in node.children.keys(): | 54 | for key in node.children.keys(): |
@@ -64,7 +62,7 @@ class DirMap(object): | |||
64 | 62 | ||
65 | reduce2(self.root) | 63 | reduce2(self.root) |
66 | 64 | ||
67 | def write(self): | 65 | def write(self): |
68 | def write2(path, node): | 66 | def write2(path, node): |
69 | out_path = "/".join(path) | 67 | out_path = "/".join(path) |
70 | if node.values: | 68 | if node.values: |
@@ -73,7 +71,7 @@ class DirMap(object): | |||
73 | arr = [",".join([str(b) for b in n]) for n in node.values] | 71 | arr = [",".join([str(b) for b in n]) for n in node.values] |
74 | f.write("\n".join(arr) + "\n") | 72 | f.write("\n".join(arr) + "\n") |
75 | elif not os.path.isdir(out_path): | 73 | elif not os.path.isdir(out_path): |
76 | os.mkdir(out_path) | 74 | os.mkdir(out_path) |
77 | 75 | ||
78 | for (key, child) in node.children.iteritems(): | 76 | for (key, child) in node.children.iteritems(): |
79 | path.append(key) | 77 | path.append(key) |
@@ -94,11 +92,4 @@ class DirMap(object): | |||
94 | ret += "%s/%s\n" % (header, key) | 92 | ret += "%s/%s\n" % (header, key) |
95 | ret += str2(child, level + 1) | 93 | ret += str2(child, level + 1) |
96 | return ret | 94 | return ret |
97 | |||
98 | return "%s\n%s" % (self.out_dir, str2(self.root, 1)) | 95 | return "%s\n%s" % (self.out_dir, str2(self.root, 1)) |
99 | |||
100 | |||
101 | |||
102 | |||
103 | |||
104 | |||