From 25e7c080ce28eef73555f89fbb414e94aa311fd1 Mon Sep 17 00:00:00 2001
From: Victor Zimmermann <zimmermann@cl.uni-heidelberg.de>
Date: Thu, 29 Mar 2018 15:40:02 +0200
Subject: [PATCH] Fix paranthesis.
---
source/all-in-one.py | 2 +-
source/merge.py | 23 +++++++++++------------
source/singletons.py | 2 +-
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/source/all-in-one.py b/source/all-in-one.py
index 6a61a9e..eba4ede 100644
--- a/source/all-in-one.py
+++ b/source/all-in-one.py
@@ -14,7 +14,7 @@ import sys
time_int = int(time.strftime("%Y%m%d%H%M%S")[2:])
final_path = config.final+'{}.absinth'.format(hex(time_int)[2:])
-new_path = final_path = config.final+'.new.absinth')
+new_path = final_path = config.final+'.new.absinth'
results = open(final_path, 'w')
new_results = open(new_path, 'w')
diff --git a/source/merge.py b/source/merge.py
index 79aa06a..33f3c6b 100644
--- a/source/merge.py
+++ b/source/merge.py
@@ -14,10 +14,7 @@ import time
def main():
- if '-bl' in sys.argv:
- file_path = config.base_out
- else:
- file_path = config.output
+ file_path = config.output
files = [file_path+'/'+f for f in os.listdir(file_path)]
@@ -32,19 +29,21 @@ def main():
time_int = int(time.strftime("%Y%m%d%H%M%S")[2:])
- final_path = 'final/{}.absinth'.format(hex(time_int)[2:])
+ final_path = config.final+'{}.absinth'.format(hex(time_int)[2:])
+ new_path = config.final+'.new.absinth'
- if not os.path.exists('final'):
- os.makedirs('final')
-
- final = open(final_path, 'w')
+ final_file = open(final_path, 'w')
+ new_file = open(new_path, 'w')
- final.write('subTopicID\tresultID\n')
+ final_file.write('subTopicID\tresultID\n')
+ new_file.write('subTopicID\tresultID\n')
for r in results:
- final.write('\t'.join(r))
+ final_file.write('\t'.join(r))
+ new_file.write('\t'.join(r))
- final.close()
+ final_file.close()
+ new_file.close()
if __name__ == "__main__":
diff --git a/source/singletons.py b/source/singletons.py
index 0612162..456d6a3 100644
--- a/source/singletons.py
+++ b/source/singletons.py
@@ -14,7 +14,7 @@ import sys
time_int = int(time.strftime("%Y%m%d%H%M%S")[2:])
final_path = config.final+'{}.absinth'.format(hex(time_int)[2:])
-new_path = final_path = config.final+'.new.absinth')
+new_path = final_path = config.final+'.new.absinth'
results = open(final_path, 'w')
new_results = open(new_path, 'w')
--
GitLab