diff --git a/merge.py b/merge.py index 3c603d5..656b48c 100644 --- a/merge.py +++ b/merge.py @@ -5,7 +5,7 @@ result = [] for i in [1,2,4,8,11,12,13,14,15,16,17,18,19,20]: no = str(i) - r1 = csv.DictReader(file(no+".csv"), fieldnames=["datetime", "temp-"+no, "humid-"+no]) + r1 = csv.DictReader(file("/home/tutimura/public_html/cgi-bin/ondotori/"+no+".csv"), fieldnames=["datetime", "temp-"+no, "humid-"+no]) result+=list(r1) #result = sum(result,[]) #flatten list of list @@ -16,6 +16,7 @@ prev="" fa = [] for entry in result: + if entry["datetime"] < "2016/12/01 00:00": continue if entry["datetime"] == prev: fa[-1] = {k: v for dic in [entry, fa[-1]] for k, v in dic.items()}