# HG changeset patch # User Michiel Broek # Date 1586531198 -7200 # Node ID fd7da95708101650c9aa00a29b286017ff502884 # Parent 52053730f6e16d748b6b46efb464f91327c2d535 Copy brew logs in splitted batches. diff -r 52053730f6e1 -r fd7da9570810 README.design --- a/README.design Sun Apr 05 12:51:10 2020 +0200 +++ b/README.design Fri Apr 10 17:06:38 2020 +0200 @@ -23,8 +23,6 @@ Toevoegen Barrel/Oak aging vergisting stap. Wort souring stap. -Add dry-hop toevoegen moment. - Split batch: Split fields: @@ -46,8 +44,6 @@ View - master alleen wijzigen voor splitspunt. - splitsingen alleen wijzigen na splitspunt. -Bij splits na brouwen, de brouw log records kopieren onder nieuwe code en naam. includes/db_divide.php - Hop types: Extract IKE. diff -r 52053730f6e1 -r fd7da9570810 www/includes/db_divides.php --- a/www/includes/db_divides.php Sun Apr 05 12:51:10 2020 +0200 +++ b/www/includes/db_divides.php Fri Apr 10 17:06:38 2020 +0200 @@ -92,9 +92,10 @@ /* * Insert splitted batches */ + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); $sql = "INSERT INTO `products` SET "; $sql .= "name='" . mysqli_real_escape_string($link, $split['name']); - $sql .= "', uuid='" . str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql .= "', uuid='" . $uuid; $sql .= "', code='" . mysqli_real_escape_string($link, $split['code']); $sql .= "', birth='" . $row['birth']; $sql .= "', stage='" . $row['stage']; @@ -377,6 +378,32 @@ } else { $lastid = mysqli_insert_id($link); syslog(LOG_NOTICE, "db_divide: inserted record ".$lastid." code ".$split['code']); + /* Copy brew log records */ + if ($row['log_brew'] == '1') { + $result3 = mysqli_query($link, "SELECT * FROM log_brews WHERE code='" . $row['code'] . "'"); + if (! $result3) { + syslog(LOG_NOTICE, "db_divide: result3: ".mysqli_error($link)); + } + while ($row3 = mysqli_fetch_array($result3)) { + $sql3 = "INSERT INTO log_brews SET datetime='" . $row3['datetime']; + $sql3 .= "', version='" . $row3['version']; + $sql3 .= "', uuid='" . $uuid; + $sql3 .= "', code='" . mysqli_real_escape_string($link, $split['code']); + $sql3 .= "', name='" . mysqli_real_escape_string($link, $split['name']); + $sql3 .= "', pv_mlt='" . $row3['pv_mlt']; + $sql3 .= "', pv_hlt='" . $row3['pv_hlt']; + $sql3 .= "', pv_room='" . $row3['pv_room']; + $sql3 .= "', sp_mlt='" . $row3['sp_mlt']; + $sql3 .= "', sp_hlt='" . $row3['sp_hlt']; + $sql3 .= "', pwm_mlt='" . $row3['pwm_mlt']; + $sql3 .= "', pwm_hlt='" . $row3['pwm_hlt']; + $sql3 .= "', event='" . $row3['event'] . "';"; + $result4 = mysqli_query($link, $sql3); + if (! $result4) { + syslog(LOG_NOTICE, "db_divide: result4: ".mysqli_error($link)." ".$sql3); + } + } + } } }