diff --git a/merge.py b/merge.py index ea8a1b0..f51788e 100755 --- a/merge.py +++ b/merge.py @@ -1,7 +1,7 @@ -#!/usr/bin/python +#!/usr/bin/env python import csv -import lzma +from backports import lzma from datetime import date, timedelta result = [] @@ -15,11 +15,11 @@ 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 00:00") + to_s = to.strftime("%Y/%m/%d 23:59") tmplist = [] for i in sensorlist: no = str(i) - fname = "/home/tutimura/public_html/cgi-bin/ondotori/data/"+no+"/"+dname+".csv.xz" + 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