diff -r 3cbd81ea9391 -r d202777ebae5 bmsd/mysql.c --- a/bmsd/mysql.c Sat Jan 19 20:42:11 2019 +0100 +++ b/bmsd/mysql.c Mon Jan 21 20:45:18 2019 +0100 @@ -512,94 +512,3 @@ } - -void fermentation_mysql_log(fermentation_log *log) -{ - char *query, buf[65]; - - query = xstrcpy((char *)"INSERT INTO log_fermentation SET datetime='"); - query = xstrcat(query, log->datetime); - query = xstrcat(query, (char *)":00"); - if (log->product_uuid) { - query = xstrcat(query, (char *)"', product_uuid='"); - query = xstrcat(query, log->product_uuid); - } - if (log->product_code) { - query = xstrcat(query, (char *)"', product_code='"); - query = xstrcat(query, log->product_code); - } - if (log->product_name) { - query = xstrcat(query, (char *)"', product_name='"); - query = xstrcat(query, log->product_name); - } - query = xstrcat(query, (char *)"', stage='"); - query = xstrcat(query, log->stage); - query = xstrcat(query, (char *)"', mode='"); - query = xstrcat(query, log->mode); - query = xstrcat(query, (char *)"', temperature_beer='"); - snprintf(buf, 64, "%.3f", log->temperature_beer); - query = xstrcat(query, buf); - query = xstrcat(query, (char *)"', temperature_air='"); - snprintf(buf, 64, "%.3f", log->temperature_air); - query = xstrcat(query, buf); - query = xstrcat(query, (char *)"', temperature_chiller='"); - snprintf(buf, 64, "%.3f", log->temperature_chiller); - query = xstrcat(query, buf); - query = xstrcat(query, (char *)"', temperature_room='"); - snprintf(buf, 64, "%.3f", log->temperature_room); - query = xstrcat(query, buf); - query = xstrcat(query, (char *)"', target_low='"); - snprintf(buf, 64, "%.1f", log->setpoint_low); - query = xstrcat(query, buf); - query = xstrcat(query, (char *)"', target_high='"); - snprintf(buf, 64, "%.1f", log->setpoint_high); - query = xstrcat(query, buf); - query = xstrcat(query, (char *)"', heater_power='"); - snprintf(buf, 64, "%d", log->heater_power); - query = xstrcat(query, buf); - query = xstrcat(query, (char *)"', heater_usage='"); - snprintf(buf, 64, "%ld", log->heater_usage); - query = xstrcat(query, buf); - query = xstrcat(query, (char *)"', cooler_power='"); - snprintf(buf, 64, "%d", log->cooler_power); - query = xstrcat(query, buf); - query = xstrcat(query, (char *)"', cooler_usage='"); - snprintf(buf, 64, "%ld", log->cooler_usage); - query = xstrcat(query, buf); - query = xstrcat(query, (char *)"', fan_power='"); - snprintf(buf, 64, "%d", log->fan_power); - query = xstrcat(query, buf); - query = xstrcat(query, (char *)"', fan_usage='"); - snprintf(buf, 64, "%ld", log->fan_usage); - query = xstrcat(query, buf); - query = xstrcat(query, (char *)"'"); - // sg - if (log->event) { - query = xstrcat(query, (char *)", event='"); - query = xstrcat(query, log->event); - query = xstrcat(query, (char *)"'"); - } - if (log->fermenter_uuid) { - query = xstrcat(query, (char *)", fermenter_uuid='"); - query = xstrcat(query, log->fermenter_uuid); - query = xstrcat(query, (char *)"'"); - } - if (log->fermenter_node) { - query = xstrcat(query, (char *)", fermenter_node='"); - query = xstrcat(query, log->fermenter_node); - query = xstrcat(query, (char *)"'"); - } - if (log->fermenter_alias) { - query = xstrcat(query, (char *)", fermenter_alias='"); - query = xstrcat(query, log->fermenter_alias); - query = xstrcat(query, (char *)"'"); - } - - if (mysql_real_query(con, query, strlen(query))) { - syslog(LOG_NOTICE, "MySQL: `%s' error %u (%s)\n)", query, mysql_errno(con), mysql_error(con)); - } - - free(query); -} - -