comparison: www/import/from_brouwhulp.php
www/import/from_brouwhulp.php
- changeset 32
- 8bb369f32ef9
- parent 30
- f5ab22446aa5
- child 35
- d6314a95021c
equal
deleted
inserted
replaced
| 31:d7b40a7d8ac6 | 32:8bb369f32ef9 |
|---|---|
| 33 $sql = "INSERT INTO inventory_fermentables SET name='" . mysqli_real_escape_string($db, $fermentable->NAME); | 33 $sql = "INSERT INTO inventory_fermentables SET name='" . mysqli_real_escape_string($db, $fermentable->NAME); |
| 34 $sql .= "', type='" . $fermentable->TYPE; | 34 $sql .= "', type='" . $fermentable->TYPE; |
| 35 if ($fermentable->YIELD) | 35 if ($fermentable->YIELD) |
| 36 $sql .= "', yield='" . $fermentable->YIELD; | 36 $sql .= "', yield='" . $fermentable->YIELD; |
| 37 if ($fermentable->COLOR) { | 37 if ($fermentable->COLOR) { |
| 38 $srm = $fermentable->COLOR; | 38 $srm = floatval($fermentable->COLOR); |
| 39 $ebc = srm_to_ebc($srm); | 39 $ebc = srm_to_ebc($srm); |
| 40 if ($ebc < 0) | |
| 41 $ebc = 0; | |
| 42 $nsrm = ebc_to_srm($ebc); | |
| 43 echo 'SRM '.$srm.' EBC '.$ebc.' back '.$nsrm.PHP_EOL; | |
| 44 $sql .= "', color='" . $ebc; | 40 $sql .= "', color='" . $ebc; |
| 45 } | 41 } |
| 46 ($fermentable->ADD_AFTER_BOIL == "TRUE") ? $sql .= "', add_after_boil='1" : $sql .= "', add_after_boil='0"; | 42 ($fermentable->ADD_AFTER_BOIL == "TRUE") ? $sql .= "', add_after_boil='1" : $sql .= "', add_after_boil='0"; |
| 47 $sql .= "', origin='" . mysqli_real_escape_string($db, $fermentable->ORIGIN); | 43 $sql .= "', origin='" . mysqli_real_escape_string($db, $fermentable->ORIGIN); |
| 48 $sql .= "', supplier='" . mysqli_real_escape_string($db, $fermentable->SUPPLIER); | 44 $sql .= "', supplier='" . mysqli_real_escape_string($db, $fermentable->SUPPLIER); |
| 60 ($fermentable->RECOMMEND_MASH == "TRUE") ? $sql .= "', recommend_mash='1" : $sql .= "', recommend_mash='0"; | 56 ($fermentable->RECOMMEND_MASH == "TRUE") ? $sql .= "', recommend_mash='1" : $sql .= "', recommend_mash='0"; |
| 61 if ($fermentable->IBU_GAL_PER_LB) | 57 if ($fermentable->IBU_GAL_PER_LB) |
| 62 $sql .= "', ibu_gal_per_lb='" . $fermentable->IBU_GAL_PER_LB; | 58 $sql .= "', ibu_gal_per_lb='" . $fermentable->IBU_GAL_PER_LB; |
| 63 ($fermentable->ALWAYS_ON_STOCK == "TRUE") ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0"; | 59 ($fermentable->ALWAYS_ON_STOCK == "TRUE") ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0"; |
| 64 if ($fermentable->INVENTORY) | 60 if ($fermentable->INVENTORY) |
| 65 $sql .= "', inventory='" . $fermentable->INVENTORY; | 61 $sql .= "', inventory='" . floatval($fermentable->INVENTORY); |
| 66 if ($fermentable->COST) | 62 if ($fermentable->COST) |
| 67 $sql .= "', cost='" . $fermentable->COST; | 63 $sql .= "', cost='" . floatval($fermentable->COST); |
| 68 /* | 64 /* |
| 69 * These are not beerxml standard: | 65 * These are not beerxml standard: |
| 70 */ | 66 */ |
| 71 if ($fermentable->DI_pH) | 67 if ($fermentable->DI_pH) |
| 72 $sql .= "', di_ph='" . $fermentable->DI_pH; | 68 $sql .= "', di_ph='" . $fermentable->DI_pH; |
| 116 $sql .= "', notes='" . mysqli_real_escape_string($db, $hop->NOTES); | 112 $sql .= "', notes='" . mysqli_real_escape_string($db, $hop->NOTES); |
| 117 $sql .= "', origin='" . mysqli_real_escape_string($db, $hop->ORIGIN); | 113 $sql .= "', origin='" . mysqli_real_escape_string($db, $hop->ORIGIN); |
| 118 $sql .= "', substitutes='" . mysqli_real_escape_string($db, $hop->SUBSTITUTES); | 114 $sql .= "', substitutes='" . mysqli_real_escape_string($db, $hop->SUBSTITUTES); |
| 119 ($hop->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0"; | 115 ($hop->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0"; |
| 120 if ($hop->INVENTORY) | 116 if ($hop->INVENTORY) |
| 121 $sql .= "', inventory='" . $hop->INVENTORY / 1000.0; | 117 $sql .= "', inventory='" . floatval($hop->INVENTORY) / 1000.0; |
| 122 if ($hop->COST) | 118 if ($hop->COST) |
| 123 $sql .= "', cost='" . $hop->COST; | 119 $sql .= "', cost='" . floatval($hop->COST); |
| 124 if ($hop->TOTAL_OIL) | 120 if ($hop->TOTAL_OIL) |
| 125 $sql .= "', total_oil='" . $hop->TOTAL_OIL; | 121 $sql .= "', total_oil='" . $hop->TOTAL_OIL; |
| 126 $sql .= "';"; | 122 $sql .= "';"; |
| 127 if (! $result = mysqli_query($db, $sql)) { | 123 if (! $result = mysqli_query($db, $sql)) { |
| 128 printf("Error: %s\n", mysqli_error($db)); | 124 printf("Error: %s\n", mysqli_error($db)); |
| 162 $sql .= "', notes='" . mysqli_real_escape_string($db, $yeast->NOTES); | 158 $sql .= "', notes='" . mysqli_real_escape_string($db, $yeast->NOTES); |
| 163 $sql .= "', best_for='" . mysqli_real_escape_string($db, $yeast->BEST_FOR); | 159 $sql .= "', best_for='" . mysqli_real_escape_string($db, $yeast->BEST_FOR); |
| 164 if ($yeast->MAX_REUSE) | 160 if ($yeast->MAX_REUSE) |
| 165 $sql .= "', max_reuse='" . $yeast->MAX_REUSE; | 161 $sql .= "', max_reuse='" . $yeast->MAX_REUSE; |
| 166 if ($yeast->INVENTORY) | 162 if ($yeast->INVENTORY) |
| 167 $sql .= "', inventory='" . $yeast->INVENTORY; | 163 $sql .= "', inventory='" . floatval($yeast->INVENTORY) / 1000.0; |
| 168 if ($yeast->COST) | 164 if ($yeast->COST) |
| 169 $sql .= "', cost='" . $yeast->COST; | 165 $sql .= "', cost='" . floatval($yeast->COST) * 1000.0; |
| 170 if ($yeast->CULTURE_DATE) { | 166 if ($yeast->CULTURE_DATE) { |
| 171 $date = substr($yeast->CULTURE_DATE, 6, 4) . '-' . substr($yeast->CULTURE_DATE, 3, 2) . '-' . substr($yeast->CULTURE_DATE, 0, 2); | 167 $date = substr($yeast->CULTURE_DATE, 6, 4) . '-' . substr($yeast->CULTURE_DATE, 3, 2) . '-' . substr($yeast->CULTURE_DATE, 0, 2); |
| 172 $sql .= "', production_date='" . $date; | 168 $sql .= "', production_date='" . $date; |
| 173 } | 169 } |
| 174 $sql .= "';"; | 170 $sql .= "';"; |
| 252 if ($misc->USE_FOR) | 248 if ($misc->USE_FOR) |
| 253 $sql .= "', use_for='" . mysqli_real_escape_string($db, $misc->USE_FOR); | 249 $sql .= "', use_for='" . mysqli_real_escape_string($db, $misc->USE_FOR); |
| 254 if ($misc->ALWAYS_ON_STOCK) | 250 if ($misc->ALWAYS_ON_STOCK) |
| 255 ($misc->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0"; | 251 ($misc->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0"; |
| 256 if ($misc->INVENTORY) | 252 if ($misc->INVENTORY) |
| 257 $sql .= "', inventory='" . $misc->INVENTORY; | 253 $sql .= "', inventory='" . floatval($misc->INVENTORY) / 1000.0; |
| 258 if ($misc->COST) | 254 if ($misc->COST) |
| 259 $sql .= "', cost='" . $misc->COST; | 255 $sql .= "', cost='" . floatval($misc->COST); |
| 260 $sql .= "';"; | 256 $sql .= "';"; |
| 261 if (! $result = mysqli_query($db, $sql)) { | 257 if (! $result = mysqli_query($db, $sql)) { |
| 262 printf("Error: %s\n", mysqli_error($db)); | 258 printf("Error: %s\n", mysqli_error($db)); |
| 263 } | 259 } |
| 264 } | 260 } |
| 433 | 429 |
| 434 | 430 |
| 435 | 431 |
| 436 do_fermentables(); | 432 do_fermentables(); |
| 437 do_hops(); | 433 do_hops(); |
| 438 //do_yeasts(); | 434 do_yeasts(); |
| 439 //do_miscs(); | 435 do_miscs(); |
| 440 //do_waters(); | 436 //do_waters(); |
| 441 //do_equipments(); | 437 //do_equipments(); |
| 442 do_styles(); | 438 do_styles(); |
| 443 //do_mash(); | 439 //do_mash(); |
| 444 | 440 |
