commit c1919866912d8106b522b9092641022ddaf31137
author Harald Welte <laforge@gnumonks.org> Thu May 13 12:55:20 2010 +0200
committer Harald Welte <laforge@gnumonks.org> Thu May 13 12:55:20 2010 +0200
tree 975e1dff6823f30d5c356eacfd1cdc1d0e9a5960
parent 73b2359fb02d04ab76c512cb09660735c1306f87

[GPRS] NS: more rate counters for BLOCK / DEAD count

openbsc/src/db.c

diff --git a/openbsc/src/db.c b/openbsc/src/db.c
index f7fb3b4..57a7863 100644
--- a/openbsc/src/db.c
+++ b/openbsc/src/db.c
@@ -127,6 +127,13 @@
 		"value INTEGER NOT NULL, "
 		"name TEXT NOT NULL "
 		")",
+	"CREATE TABLE IF NOT EXISTS RateCounters ("
+		"id INTEGER PRIMARY KEY AUTOINCREMENT, "
+		"timestamp TIMESTAMP NOT NULL, "
+		"value INTEGER NOT NULL, "
+		"name TEXT NOT NULL, "
+		"index INTEGER NOT NULL "
+		")",
 	"CREATE TABLE IF NOT EXISTS AuthKeys ("
 		"id INTEGER PRIMARY KEY AUTOINCREMENT, "
 		"subscriber_id INTEGER UNIQUE NOT NULL, "
@@ -1194,10 +1201,10 @@
 				   &q_name);
 
 	result = dbi_conn_queryf(conn,
-		"Insert INTO Counters "
-		"(timestamp,name,value) VALUES "
-		"(datetime('now'),%s.%s,%"PRIu64")",
-		q_prefix, q_name, ctrg->ctr[num].current);
+		"Insert INTO RateCounters "
+		"(timestamp,name,index,value) VALUES "
+		"(datetime('now'),%s.%s,%u,%"PRIu64")",
+		q_prefix, q_name, ctrg->idx, ctrg->ctr[num].current);
 
 	free(q_name);
 
@@ -1213,7 +1220,7 @@
 	unsigned int i;
 	char *q_prefix;
 
-	dbi_conn_quote_string_copy(conn, ctrg->name_prefix, &q_prefix);
+	dbi_conn_quote_string_copy(conn, ctrg->desc->group_name_prefix, &q_prefix);
 
 	for (i = 0; i < ctrg->desc->num_ctr; i++)
 		db_store_rate_ctr(ctrg, i, q_prefix);