X-Git-Url: http://www.average.org/gitweb/?p=pulsecounter.git;a=blobdiff_plain;f=linux%2Fdbstore.c;h=42fe8e712f9f4fa2a79b3957716e490e520b5d6b;hp=1a85dbac1a7a50eb2564982cead098587f1fcc08;hb=44a6bf988373b8f598481167da21504cd0118a2a;hpb=8ccd96947c30f401410182f29e7a9cd19224380c

diff --git a/linux/dbstore.c b/linux/dbstore.c
index 1a85dba..42fe8e7 100644
--- a/linux/dbstore.c
+++ b/linux/dbstore.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdint.h>
 #include <time.h>
 #include <ctype.h>
@@ -34,12 +35,12 @@ int dbconfig(char *conffile)
 			rc = 1;
 			break;
 		}
-		for (k = buf; k < e && isspace(k); k++) /*nothing*/ ;
+		for (k = buf; k < e && isspace(*k); k++) /*nothing*/ ;
 		if (*k == '#') break;
-		for (v = k; v < e && !isspace(v)
+		for (v = k; v < e && !isspace(*v)
 			    && *v != ':' && *v != '='; v++) /*nothing*/ ;
 		if (v < e && (*v == ':' || *v == '=')) v++;
-		for (; v < e && (isspace(v) || *v == ':' || *v == '=')
+		for (; v < e && (isspace(*v) || *v == ':' || *v == '=')
 		     					; v++) /*nothing*/ ;
 		if (v >= e) {
 			/* no value */
@@ -68,8 +69,10 @@ int dbstore(uint8_t which, uint32_t val)
 	struct tm tm;
 	char buf[64];
 	char tstr[32];
-	char *table = (which == 1) ? "coldcnt" : "hotcnt";
+	char *table = (which == 1) ? "cold" : "hot";
 	char statement[64];
+	MYSQL_RES *result;
+	uint32_t prev_val = 0;
 
 	t = time(NULL);
 	(void)gmtime_r(&t, &tm);
@@ -79,13 +82,40 @@ int dbstore(uint8_t which, uint32_t val)
 		g_warning("mysql connect error: %s\n", mysql_error(&mysql));
 		return 1;
 	}
+	mysql_autocommit(&mysql, FALSE);
+	/* ======== */
 	snprintf(statement, sizeof(statement),
-		 "insert into %s values (\"%s\",%u);\n",
+		 "select value from %scnt order by timestamp desc limit 1;\n",
+		 table);
+	if ((rc = mysql_query(&mysql, statement)))
+		g_warning("mysql \"%s\" error: %s\n",
+				statement, mysql_error(&mysql));
+	else if ((result = mysql_store_result(&mysql))){
+		MYSQL_ROW row = mysql_fetch_row(result);
+		if (row && *row) prev_val = atoi(*row);
+		mysql_free_result(result);
+	}
+	if (val <= prev_val) {
+		snprintf(statement, sizeof(statement),
+			 "insert into %sadj values (\"%s\",%u);\n",
+			 table, tstr, prev_val);
+		g_info("%s %u <= %u, %s", table, val, prev_val, statement);
+		if ((rc = mysql_query(&mysql, statement)))
+			g_warning("mysql \"%s\" error: %s\n",
+					statement, mysql_error(&mysql));
+	}
+	snprintf(statement, sizeof(statement),
+		 "insert into %scnt values (\"%s\",%u);\n",
 		 table, tstr, val);
-	rc = mysql_query(&mysql, statement);
-	if (rc)
-		g_warning("mysql insert \"%s\" error: %s\n",
+	if ((rc = mysql_query(&mysql, statement)))
+		g_warning("mysql \"%s\" error: %s\n",
 				statement, mysql_error(&mysql));
+	/* ======== */
+	if (!rc) {
+		if ((rc = mysql_commit(&mysql)))
+			g_warning("mysql commit error: %s\n",
+					mysql_error(&mysql));
+	}
 	mysql_close(&mysql);
 	return rc;
 }