X-Git-Url: http://www.average.org/gitweb/?p=pulsecounter.git;a=blobdiff_plain;f=linux%2Fdbstore.c;h=d5d7ee7fe89bf044c973ddec4a182e91333df7db;hp=b39235b1b2eb66c241840e2e9b4d223862555447;hb=0b9cbcb21231c3a12a9d8c579ace126eb97166e5;hpb=9e60d66129fbe12edece200733bd42a7566ab10e

diff --git a/linux/dbstore.c b/linux/dbstore.c
index b39235b..d5d7ee7 100644
--- a/linux/dbstore.c
+++ b/linux/dbstore.c
@@ -1,9 +1,12 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdint.h>
 #include <time.h>
 #include <ctype.h>
 #include <string.h>
 
+#include <glib.h>
+
 #include <mysql/mysql.h>
 
 #include "dbstore.h"
@@ -16,40 +19,49 @@ static char *dbnm = "watermeter";
 int dbconfig(char *conffile)
 {
 	FILE *fp = fopen(conffile, "r");
+	int lc = 0;
 	int rc = 0;
 	char buf[128];
 
-	if (!fp)
-		return 1;
+	if (!fp) return 1;
 	while (fgets(buf, sizeof(buf), fp)) {
 		char *k, *v, *e;
 
+		lc++;
 		e = buf + strlen(buf) - 1;
-		if (*e == '\n')
-			*e = '\0';
+		if (*e == '\n') *e = '\0';
 		else {
-			/* line too long */
+			g_warning("%s:%d line too long", conffile, lc);
 			rc = 1;
 			break;
 		}
-		for (k = buf; k < e && isspace(k); k++) /*nothing*/ ;
-		if (*k == '#') break;
-		for (v = k; v < e && !isspace(v)
+		if ((k = strchr(buf, '#'))) {
+			e=k;
+			*e = '\0';
+		}
+		for (k = buf; k < e && isspace(*k); k++) /*nothing*/ ;
+		for (v = k; v < e && !isspace(*v)
 			    && *v != ':' && *v != '='; v++) /*nothing*/ ;
-		if (v < e && (*v == ':' || *v == '=')) v++;
-		for (; v < e && (isspace(v) || *v == ':' || *v == '=')
+		*v++ = '\0';
+		if (*k == '\0') continue; /* empty or comment-only line */
+		for (; v < e && (isspace(*v) || *v == ':' || *v == '=')
 		     					; v++) /*nothing*/ ;
 		if (v >= e) {
-			/* no value */
+			g_warning("%s:%d no value for key \"%s\"",
+					conffile, lc, k);
 			rc = 1;
 			break;
-		}
+		} 
+#ifdef TEST_CONFIG
+		printf("k=%s v=%s\n", k, v);
+#endif
 		if      (!strcmp(k, "host"))     host = strdup(v);
 		else if (!strcmp(k, "user"))     user = strdup(v);
 		else if (!strcmp(k, "password")) pass = strdup(v);
 		else if (!strcmp(k, "database")) dbnm = strdup(v);
 		else {
-			/* unknown key */
+			g_warning("%s:%d unrecognized key \"%s\"",
+					conffile, lc, k);
 			rc = 1;
 			break;
 		}
@@ -66,25 +78,66 @@ 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);
 	(void)strftime(tstr, sizeof(tstr), "%Y-%m-%d %H:%M:%S", &tm);
 	mysql_init(&mysql);
 	if(!mysql_real_connect(&mysql, host, user, pass, dbnm, 0, NULL, 0)) {
-		fprintf(stderr, "mysql connect error: %s\n",
-			mysql_error(&mysql));
+		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)
-		fprintf(stderr, "mysql insert \"%s\" error: %s\n",
-			statement, mysql_error(&mysql));
+	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;
 }
+
+#ifdef TEST_CONFIG
+int main(int const argc, char *argv[])
+{
+	if (dbconfig(argv[1])) {
+		printf("could not parse config file\n");
+		return 1;
+	}
+	printf("host: %s\nuser: %s\npass: %s\ndbnm: %s\n",
+		host, user, pass, dbnm);
+	return 0;
+}
+#endif