From 669ea3aa31c196b4fd29ff1cbe3bf3827bb65048 Mon Sep 17 00:00:00 2001 From: Daniel Langesten Date: Mon, 9 Mar 2015 14:22:50 +0100 Subject: fixed timespans --- cleaner.go | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/cleaner.go b/cleaner.go index 6e8832f..662eb2d 100644 --- a/cleaner.go +++ b/cleaner.go @@ -15,7 +15,7 @@ const ( DATABASE_NAME = "netflow" MAXIMUM_ENTRIES = 100 TIMESPAN = "day" - EPSILON = 1 + EPSILON = 1000 ) func cleanData() (err error) { @@ -76,11 +76,30 @@ func cleanData() (err error) { func getTimespan(t time.Time) (span time.Time, err error) { loc, err := time.LoadLocation("Local") switch { - case TIMESPAN == "5min": + case TIMESPAN == "5min": //Round the date into 5 minutes + y, m, d, h, min := t.Date() + if err != nil { + return + } + min = min / 5 + span = time.Date(y, m, d, h, min, 0, 0, loc) + + case TIMESPAN == "10min": //Round the date into 10 minutes + y, m, d, h, min := t.Date() + if err != nil { + return + } + min = min / 10 + span = time.Date(y, m, d, h, min, 0, 0, loc) - case TIMESPAN == "hour": + case TIMESPAN == "hour": //Round the date into hour + y, m, d, h := t.Date() + if err != nil { + return + } + span = time.Date(y, m, d, h, 0, 0, 0, loc) - case TIMESPAN == "day": + case TIMESPAN == "day": //Round the date into day y, m, d := t.Date() if err != nil { return -- cgit v1.1