diff -r dad62ec9af18 -r 7b2f11652d67 www/import/from_brouwhulp.php --- a/www/import/from_brouwhulp.php Wed Jan 23 22:53:24 2019 +0100 +++ b/www/import/from_brouwhulp.php Thu Jan 24 20:54:45 2019 +0100 @@ -276,10 +276,18 @@ $sql .= "', best_for='" . mysqli_real_escape_string($db, $yeast->BEST_FOR); if ($yeast->MAX_REUSE) $sql .= "', max_reuse='" . $yeast->MAX_REUSE; + + if ($yeast->FORM == 'Liquid') { + $sql .= "', cells='100000000000"; // 100 billion cells per pack + } else if ($yeast->FORM == 'Dry') { + $sql .= "', cells='15000000000"; // 6..15 billion per gram + } else { + $sql .= "', cells='1700000000"; // 1.7 billion cells per ml. + } if ($yeast->INVENTORY) - $sql .= "', inventory='" . floatval($yeast->INVENTORY) / 1000.0; + $sql .= "', inventory='" . floatval($yeast->INVENTORY) / 1000.0; // To kg or liter if ($yeast->COST) - $sql .= "', cost='" . floatval($yeast->COST) * 1000.0; + $sql .= "', cost='" . floatval($yeast->COST) * 1000.0; // to Euro/kg or liter if ($yeast->CULTURE_DATE) { $date = substr($yeast->CULTURE_DATE, 6, 4) . '-' . substr($yeast->CULTURE_DATE, 3, 2) . '-' . substr($yeast->CULTURE_DATE, 0, 2); $sql .= "', production_date='" . $date; @@ -356,8 +364,39 @@ $sql = "INSERT INTO inventory_miscs SET name='" . mysqli_real_escape_string($db, $misc->NAME); if ($misc->NOTES) $sql .= "', notes='" . mysqli_real_escape_string($db, $misc->NOTES); - $sql .= "', type='" . $misc->TYPE; - $sql .= "', use_use='" . $misc->USE; + + if ($misc->TYPE == 'Spice') + $sql .= "', type='0"; + else if ($misc->TYPE == 'Herb') + $sql .= "', type='1"; + else if ($misc->TYPE == 'Flavor') + $sql .= "', type='2"; + else if ($misc->TYPE == 'Fining') + $sql .= "', type='3"; + else if ($misc->TYPE == 'Water agent') + $sql .= "', type='4"; + else if ($misc->TYPE == 'Yeast nutrient') + $sql .= "', type='5"; + else if ($misc->TYPE == 'Other') + $sql .= "', type='6"; + else + echo "Unknown TYPE " . $misc->TYPE . PHP_EOL; + + if ($misc->USE == 'Starter') + $sql .= "', use_use='0"; + else if ($misc->USE == 'Mash') + $sql .= "', use_use='1"; + else if ($misc->USE == 'Boil') + $sql .= "', use_use='2"; + else if ($misc->USE == 'Primary') + $sql .= "', use_use='3"; + else if ($misc->USE == 'Secondary') + $sql .= "', use_use='4"; + else if ($misc->USE == 'Bottling') + $sql .= "', use_use='5"; + else + echo "Unknown USE " . $misc->USE . PHP_EOL; + $sql .= "', time='" . $misc->TIME; ($misc->AMOUNT_IS_WEIGHT == 'TRUE') ? $sql .= "', amount_is_weight='1" : $sql .= "', amount_is_weight='0"; if ($misc->USE_FOR)