added variable for selecting wich table to operate on

1 files changed, 8 insertions, 7 deletions

diff --git a/sqlQueries.go b/sqlQueries.go
index 542acfa..52b6b98 100644
--- a/sqlQueries.go
+++ b/sqlQueries.go
@@ -9,6 +9,7 @@ import (
 
 const (
 	TIMEZONE = "UTC"
+	TABLE    = "copyOfData"
 )
 
 //Retrieves limit rawdata entries that are older than tim
@@ -17,9 +18,9 @@ func fetchRawData(db *sql.DB, tim time.Time, limit int) (rDat []rawData, err err
 
 	var prepSel *sql.Stmt
 	if limit > 0 {
-		prepSel, err = db.Prepare("SELECT ip_src,ip_dst,as_src,as_dst,port_src,port_dst,packets,pkt_len_distrib,stamp_inserted FROM acct WHERE stamp_processed IS NULL AND stamp_inserted < ? LIMIT ?")
+		prepSel, err = db.Prepare("SELECT ip_src,ip_dst,as_src,as_dst,port_src,port_dst,packets,pkt_len_distrib,stamp_inserted FROM " + TABLE + " WHERE stamp_processed IS NULL AND stamp_inserted < ? LIMIT ?")
 	} else {
-		prepSel, err = db.Prepare("SELECT ip_src,ip_dst,as_src,as_dst,port_src,port_dst,packets,pkt_len_distrib,stamp_inserted FROM acct WHERE stamp_processed IS NULL AND stamp_inserted < ?")
+		prepSel, err = db.Prepare("SELECT ip_src,ip_dst,as_src,as_dst,port_src,port_dst,packets,pkt_len_distrib,stamp_inserted FROM " + TABLE + " WHERE stamp_processed IS NULL AND stamp_inserted < ?")
 	}
 	if err != nil {
 		log.Println("Failed to prepare select")
@@ -44,7 +45,7 @@ func fetchRawData(db *sql.DB, tim time.Time, limit int) (rDat []rawData, err err
 		return
 	}
 
-	prepUp, err := tx.Prepare("UPDATE acct SET stamp_processed = ? where ip_src = ? AND ip_dst = ? AND as_src = ? AND as_dst = ? AND port_src = ? AND port_dst = ? AND packets = ? AND pkt_len_distrib = ? AND stamp_inserted = ?")
+	prepUp, err := tx.Prepare("UPDATE " + TABLE + " SET stamp_processed = ? where ip_src = ? AND ip_dst = ? AND as_src = ? AND as_dst = ? AND port_src = ? AND port_dst = ? AND packets = ? AND pkt_len_distrib = ? AND stamp_inserted = ?")
 	if err != nil {
 		log.Println("Failed to prepare update")
 		return
@@ -80,7 +81,7 @@ func fetchRawData(db *sql.DB, tim time.Time, limit int) (rDat []rawData, err err
 
 //Removes the stamp_processed from every entry that started being proccesed before tim
 func reprocess(db *sql.DB, tim time.Time) (err error) {
-	stmt, err := db.Prepare("UPDATE acct SET stamp_processed = NULL WHERE stamp_processed < ?")
+	stmt, err := db.Prepare("UPDATE " + TABLE + " SET stamp_processed = NULL WHERE stamp_processed < ?")
 	if err != nil {
 		return
 	}
@@ -91,7 +92,7 @@ func reprocess(db *sql.DB, tim time.Time) (err error) {
 
 //Removes all entries in the database that started being processed before tim
 func purgeAllProcessed(db *sql.DB, tim time.Time) (err error) {
-	stmt, err := db.Prepare("DELETE FROM acct WHERE stamp_processed < ? ")
+	stmt, err := db.Prepare("DELETE FROM " + TABLE + " WHERE stamp_processed < ? ")
 	if err != nil {
 		return
 	}
@@ -102,7 +103,7 @@ func purgeAllProcessed(db *sql.DB, tim time.Time) (err error) {
 
 //Removes all rawdata that is in rDat from the database
 func purgeRawData(tx *sql.Tx, rDat []rawData) (err error) {
-	prepStmt, err := tx.Prepare("DELETE FROM acct WHERE ip_src = ? AND ip_dst = ? AND as_src = ? AND as_dst = ? AND port_src = ? AND port_dst = ? AND packets = ? AND pkt_len_distrib = ? AND stamp_processed IS NOT NULL LIMIT 1")
+	prepStmt, err := tx.Prepare("DELETE FROM " + TABLE + " WHERE ip_src = ? AND ip_dst = ? AND as_src = ? AND as_dst = ? AND port_src = ? AND port_dst = ? AND packets = ? AND pkt_len_distrib = ? AND stamp_processed IS NOT NULL LIMIT 1")
 	if err != nil {
 		return
 	}
@@ -220,7 +221,7 @@ func privatizeCleaned(db *sql.DB, t time.Time, conf Config) (err error) {
 }
 
 func availableRows(tx *sql.Tx, limit time.Time) (numRows int, err error) {
-	stmt, err := tx.Prepare("SELECT COUNT(*) FROM acct WHERE stamp_inserted < ? ")
+	stmt, err := tx.Prepare("SELECT COUNT(*) FROM " + TABLE + " WHERE stamp_inserted < ? ")
 	if err != nil {
 		log.Println("Could not prepare statement")
 		return