compile issues

3 files changed, 19 insertions, 25 deletions

diff --git a/cleaner.go b/cleaner.go
index 5bda1f4..ba6f6ab 100644
--- a/cleaner.go
+++ b/cleaner.go
@@ -9,11 +9,10 @@ import (
 )
 
 const (
-	DATABASE_USER       = "root"
-	DATABASE_PASS       = "pass"
+	DATABASE_USER       = "cleaner"
+	DATABASE_PASS       = "nil"
 	DATABASE_CONNECTION = "" //e.g. "tcp(localhost:55555)
 	DATABASE_NAME       = "netflow"
-	MAXIMUM_ENTRIES     = 100
 	TIMESPAN            = "day"
 	EPSILON             = 1000
 )
@@ -34,7 +33,7 @@ func cleanData() (err error) {
 	}
 
 	//Fetch data that should be cleaned
-	rDat, err := fetchRawData(db, MAXIMUM_ENTRIES)
+	rDat, err := fetchRawData(db, time.Now().Add(-1*time.Hour))
 	if err != nil {
 		log.Println("Faild to fetch raw data")
 		return
@@ -82,35 +81,31 @@ func cleanData() (err error) {
 
 func getTimespan(t time.Time) (span time.Time, err error) {
 	loc, err := time.LoadLocation("Local")
+	if err != nil {
+		return
+	}
 	switch {
 	case TIMESPAN == "5min": //Round the date into 5 minutes
-		y, m, d, h, min := t.Date()
-		if err != nil {
-			return
-		}
+		y, m, d := t.Date()
+		h := t.Hour()
+		min := t.Minute()
 		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
-		}
+		y, m, d := t.Date()
+		h := t.Hour()
+		min := t.Minute()
 		min = min / 10
 		span = time.Date(y, m, d, h, min, 0, 0, loc)
 
 	case TIMESPAN == "hour": //Round the date into hour
-		y, m, d, h := t.Date()
-		if err != nil {
-			return
-		}
+		y, m, d := t.Date()
+		h := t.Hour()
 		span = time.Date(y, m, d, h, 0, 0, 0, loc)
 
 	case TIMESPAN == "day": //Round the date into day
 		y, m, d := t.Date()
-		if err != nil {
-			return
-		}
 		span = time.Date(y, m, d, 0, 0, 0, 0, loc)
 	default:
 		err = errors.New("Bad timespan")
diff --git a/diffpriv.go b/diffpriv.go
index 8491156..03f341f 100644
--- a/diffpriv.go
+++ b/diffpriv.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"math"
 	"math/rand"
 	"time"
diff --git a/sqlQueries.go b/sqlQueries.go
index a0c2012..aa95cba 100644
--- a/sqlQueries.go
+++ b/sqlQueries.go
@@ -10,13 +10,13 @@ import (
 //Retrieves all rawdata older than tim
 func fetchRawData(db *sql.DB, tim time.Time) (rDat []RawData, err error) {
 
-	prepSel, err := db.Prepare("SELECT ip_src,ip_dst,time,port,packet_size FROM raw_data WHERE time < tim")
+	prepSel, err := db.Prepare("SELECT ip_src,ip_dst,time,port,packet_size FROM raw_data WHERE time < ?")
 	if err != nil {
 		log.Println("Failed to prepare select")
 		return
 	}
 
-	rows, err := prepSel.Query(numRows)
+	rows, err := prepSel.Query(tim)
 	if err != nil {
 		log.Println("Failed to query prepared selection")
 		return
@@ -59,12 +59,12 @@ func fetchRawData(db *sql.DB, tim time.Time) (rDat []RawData, err error) {
 }
 
 //Removes the process_time from every entry that started being proccesed before tim
-func reprocess(db *sq.DB, tim time.Time) (err error) {
+func reprocess(db *sql.DB, tim time.Time) (err error) {
 	stmt, err := db.Prepare("UPDATE raw_data SET process_time = NULL WHERE process_time < ?")
 	if err != nil {
 		return
 	}
-	_, err = stmt.Execute(tim)
+	_, err = stmt.Exec(tim)
 
 	return
 }
@@ -75,7 +75,7 @@ func purgeProcessed(db *sql.DB, tim time.Time) (err error) {
 	if err != nil {
 		return
 	}
-	_, err = stmt.Execute(tim)
+	_, err = stmt.Exec(tim)
 
 	return
 }