compile errors and bugfix

4 files changed, 30 insertions, 18 deletions

diff --git a/cleaner.go b/cleaner.go
index 6666e91..c32abaf 100644
--- a/cleaner.go
+++ b/cleaner.go
@@ -13,7 +13,7 @@ const (
 	DATABASE_PASS       = "pass"
 	DATABASE_CONNECTION = "" //e.g. "tcp(localhost:55555)
 	DATABASE_NAME       = "netflow"
-	MAXIMUM_ENTRIES     = 1
+	MAXIMUM_ENTRIES     = 100
 	TIMESPAN            = "day"
 )
 
@@ -134,15 +134,15 @@ func clean(rDat []RawData) (cDat []CleanData, err error) {
 func removeDups(cDat []CleanData) []CleanData {
 	ret := make([]CleanData, 0)
 	var found bool
-	for _, d0 := range cDat {
+	for ci := range cDat {
 		found = false
 
 		//Check if an equal struct already is appended
-		for _, d1 := range ret {
-			if d1.equals(d0) {
+		for ri := range ret {
+			if ret[ri].equals(&cDat[ci]) {
 				//If found, increase it occurances instead of
 				//appending a new struct
-				d1.occurances += d0.occurances
+				ret[ri].occurances += cDat[ci].occurances
 				found = true
 				break
 			}
@@ -151,7 +151,7 @@ func removeDups(cDat []CleanData) []CleanData {
 		if !found {
 			//if no equal struct is found
 			//append it
-			ret = append(ret, d0)
+			ret = append(ret, cDat[ci])
 		}
 	}
 	return ret
diff --git a/datastructs.go b/datastructs.go
index c885dea..25220c5 100644
--- a/datastructs.go
+++ b/datastructs.go
@@ -1,6 +1,11 @@
 package main
 
+import (
+	"time"
+)
+
 type RawData struct {
+	ipSrc      string
 	ipDst      string
 	time       time.Time
 	port       int
@@ -21,7 +26,7 @@ type CleanData struct {
 }
 
 func (cd *CleanData) equals(other *CleanData) bool {
-	return cd.ipdbSrc == other.ipbSrc &&
+	return cd.ipbSrc == other.ipbSrc &&
 		cd.ipbDst == other.ipbDst &&
 		cd.time == other.time &&
 		cd.port == other.port &&
diff --git a/main.go b/main.go
index cd19454..19ad09a 100644
--- a/main.go
+++ b/main.go
@@ -4,24 +4,24 @@ import (
 	"bufio"
 	"log"
 	"os"
-	"strings"
+	//"strings"
 )
 
 func main() {
 
-	stdin := readFromStdin()
-	for line := range stdin {
-		strs := strings.Split(line, ",")
-		for _, str := range strs {
-			log.Println(str)
-		}
-	}
 	/*
-		err := cleanData()
-		if err != nil {
-			log.Println(err)
+		stdin := readFromStdin()
+		for line := range stdin {
+			strs := strings.Split(line, ",")
+			for _, str := range strs {
+				log.Println(str)
+			}
 		}
 	*/
+	err := cleanData()
+	if err != nil {
+		log.Println(err)
+	}
 }
 
 //Starts a process that reads from stdin and
diff --git a/sqlQueries.go b/sqlQueries.go
index 4f58242..e333c58 100644
--- a/sqlQueries.go
+++ b/sqlQueries.go
@@ -1,5 +1,12 @@
 package main
 
+import (
+	"database/sql"
+	_ "github.com/go-sql-driver/mysql"
+	"log"
+	"time"
+)
+
 func fetchRawData(db *sql.DB, numRows int) (rDat []RawData, err error) {
 	prepStmt, err := db.Prepare("SELECT * FROM raw_data LIMIT ? ")
 	if err != nil {