diff --git a/merge.py b/merge.py index 800e618..a2ba76b 100755 --- a/merge.py +++ b/merge.py @@ -6,25 +6,25 @@ result = [] sensorlist = [1,2,4,8,11,12,13,14,15,16,17,18,19,20] +#sensorlist = [8] def gather_data(frm, to, which): - global result - if which == 0: - dbdate = frm - else: - dbdate = to - dname = "%04d%02d" % (dbdate.year, dbdate.month) - frm_s = frm.strftime("%Y/%m/%d 00:00") - to_s = to.strftime("%Y/%m/%d 23:59") - tmplist = [] - for i in sensorlist: - no = str(i) - fname = "./data/"+no+"/"+dname+".csv.xz" - r1 = csv.DictReader(lzma.LZMAFile(fname), fieldnames=["datetime", "temp-"+no, "humid-"+no]) - tmp=filter(lambda x: x["datetime"] >= frm_s and x["datetime"] <= to_s, r1) - if tmp == []: continue - tmplist.append(tmp) - result += [x for s in zip(*tmplist) for x in s] + global result + if which == 0: + dbdate = frm + else: + dbdate = to + dname = "%04d%02d" % (dbdate.year, dbdate.month) + frm_s = frm.strftime("%Y/%m/%d 00:00") + to_s = to.strftime("%Y/%m/%d 23:59") + tmplist = [] + for i in sensorlist: + no = str(i) + fname = "./data/"+no+"/"+dname+".csv.xz" + r1 = csv.DictReader(lzma.LZMAFile(fname), fieldnames=["datetime", "temp-"+no, "humid-"+no]) + tmp=filter(lambda x: x["datetime"] >= frm_s and x["datetime"] <= to_s, r1) + if tmp == []: continue + result+=(tmp) to = date.today() frm = to - timedelta(15) @@ -34,6 +34,7 @@ gather_data(frm, to, 1) # align on 10 min. + for i in range(len(result)): result[i]["datetime"] = result[i]["datetime"][:-1]+"0"