diff -r fd1d7225ca6e -r 7f69b43e6084 bmsd/mysql.c --- a/bmsd/mysql.c Sat Jan 19 13:58:24 2019 +0100 +++ b/bmsd/mysql.c Sat Jan 19 17:31:43 2019 +0100 @@ -3,7 +3,7 @@ * @brief MySQL/MariaDB access. * @author Michiel Broek * - * Copyright (C) 2018 + * Copyright (C) 2018-2019 * * This file is part of the bms (Brewery Management System) * @@ -147,6 +147,7 @@ fermenter->online = false; // Will be set later fermenter->beercode = xstrcpy(row[5]); fermenter->beername = xstrcpy(row[6]); + fermenter->beeruuid = xstrcpy(row[44]); if (strlen(row[7])) { fermenter->air_address = xstrcpy(row[7]); fermenter->air_state = xstrcpy(row[8]); @@ -250,6 +251,8 @@ free(tmpf->beercode); if (tmpf->beername) free(tmpf->beername); + if (tmpf->beeruuid) + free(tmpf->beeruuid); if (tmpf->air_address) free(tmpf->air_address); if (tmpf->air_state) @@ -403,7 +406,7 @@ snprintf(query, 2559, "INSERT INTO mon_fermenters SET uuid='%s', alias='%s', node='%s', online='%s', " \ - "beercode='%s', beername='%s', " \ + "beercode='%s', beername='%s', beeruuid='%s', " \ "air_address='%s', air_state='%s', air_temperature='%.3f', " \ "beer_address='%s', beer_state='%s', beer_temperature='%.3f', " \ "chiller_address='%s', chiller_state='%s', chiller_temperature='%.3f', " \ @@ -418,6 +421,7 @@ "profile_inittemp_high='%.3f', profile_inittemp_low='%.3f', profile_steps='%s', stage='%s'", fermenter->uuid, fermenter->alias, fermenter->node, fermenter->online ? "Y":"N", fermenter->beercode ? fermenter->beercode : "", fermenter->beername ? fermenter->beername : "", + fermenter->beeruuid ? fermenter->beeruuid : "", fermenter->air_address ? fermenter->air_address : "", fermenter->air_state ? fermenter->air_state : "", fermenter->air_temperature, fermenter->beer_address ? fermenter->beer_address : "", fermenter->beer_state ? fermenter->beer_state : "", fermenter->beer_temperature, fermenter->chiller_address ? fermenter->chiller_address : "", fermenter->chiller_state ? fermenter->chiller_state : "", fermenter->chiller_temperature, @@ -450,7 +454,7 @@ char *query = malloc(2560); snprintf(query, 2559, - "UPDATE mon_fermenters SET online='%s', beercode='%s', beername='%s', " \ + "UPDATE mon_fermenters SET online='%s', beercode='%s', beername='%s', beeruuid='%s', " \ "air_address='%s', air_state='%s', air_temperature='%.3f', " \ "beer_address='%s', beer_state='%s', beer_temperature='%.3f', " \ "chiller_address='%s', chiller_state='%s', chiller_temperature='%.3f', " \ @@ -464,6 +468,7 @@ "profile_uuid='%s', profile_name='%s', profile_state='%s', profile_percent='%d', " \ "profile_inittemp_high='%.3f', profile_inittemp_low='%.3f', profile_steps='%s', stage='%s' WHERE uuid='%s'", fermenter->online ? "Y":"N", fermenter->beercode ? fermenter->beercode : "", fermenter->beername ? fermenter->beername : "", + fermenter->beeruuid ? fermenter->beeruuid : "", fermenter->air_address ? fermenter->air_address : "", fermenter->air_state ? fermenter->air_state : "", fermenter->air_temperature, fermenter->beer_address ? fermenter->beer_address : "", fermenter->beer_state ? fermenter->beer_state : "", fermenter->beer_temperature, fermenter->chiller_address ? fermenter->chiller_address : "", fermenter->chiller_state ? fermenter->chiller_state : "", fermenter->chiller_temperature,