diff -r 2ac491548d8d -r 531d5458782f www/import/from_brouwhulp.php --- a/www/import/from_brouwhulp.php Tue Jan 22 20:27:45 2019 +0100 +++ b/www/import/from_brouwhulp.php Tue Jan 22 22:46:58 2019 +0100 @@ -165,9 +165,25 @@ $sql .= "', myrcene='" . floatval($hop->MYCRENE); if ($hop->HSI) $sql .= "', hsi='" . floatval($hop->HSI); - $sql .= "', useat='Boil"; // brouwhulp says Aroma always :) - $sql .= "', type='" . $hop->TYPE; - $sql .= "', form='" . $hop->FORM; + + if ($hop->TYPE == 'Bittering') + $sql .= "', type='0"; + else if ($hop->TYPE == 'Aroma') + $sql .= "', type='1"; + else if ($hop->TYPE == 'Both') + $sql .= "', type='2"; + else + echo "Unknown TYPE " . $hop->TYPE . PHP_EOL; + + if ($hop->FORM == 'Pellet') + $sql .= "', form='0"; + else if ($hop->FORM == 'Plug') + $sql .= "', form='1"; + else if ($hop->FORM == 'Leaf') + $sql .= "', form='2"; + else + echo "Unknown FORM " . $hop->FORM . PHP_EOL; + $sql .= "', notes='" . mysqli_real_escape_string($db, $hop->NOTES); $sql .= "', origin='" . mysqli_real_escape_string($db, $hop->ORIGIN); $sql .= "', substitutes='" . mysqli_real_escape_string($db, $hop->SUBSTITUTES); @@ -178,6 +194,10 @@ $sql .= "', cost='" . floatval($hop->COST); if ($hop->TOTAL_OIL) $sql .= "', total_oil='" . floatval($hop->TOTAL_OIL); + if ($hop->HARVEST_DATE) { + $date = substr($hop->HARVEST_DATE, 6, 4).'-'.substr($hop->HARVEST_DATE, 3, 2).'-'.substr($hop->HARVEST_DATE, 0, 2); + $sql .= "', production_date='" . $date; + } $sql .= "';"; if (! $result = mysqli_query($db, $sql)) { printf("Error: %s\n", mysqli_error($db));