comparison: www/import/from_brouwhulp.php
www/import/from_brouwhulp.php
- changeset 149
- ff45488d480e
- parent 148
- c0f0bbfefd63
- child 150
- 159d7a89fcef
equal
deleted
inserted
replaced
| 148:c0f0bbfefd63 | 149:ff45488d480e |
|---|---|
| 321 $sql .= "', lauter_height='" . floatval($equipment->LAUTER_HEIGHT); | 321 $sql .= "', lauter_height='" . floatval($equipment->LAUTER_HEIGHT); |
| 322 $sql .= "', lauter_deadspace='" . floatval($equipment->LAUTER_DEADSPACE); | 322 $sql .= "', lauter_deadspace='" . floatval($equipment->LAUTER_DEADSPACE); |
| 323 $sql .= "', kettle_volume='" . floatval($equipment->KETTLE_VOLUME); | 323 $sql .= "', kettle_volume='" . floatval($equipment->KETTLE_VOLUME); |
| 324 $sql .= "', kettle_height='" . floatval($equipment->KETTLE_HEIGHT); | 324 $sql .= "', kettle_height='" . floatval($equipment->KETTLE_HEIGHT); |
| 325 $sql .= "', mash_volume='" . floatval($equipment->MASH_VOLUME); | 325 $sql .= "', mash_volume='" . floatval($equipment->MASH_VOLUME); |
| 326 $sql .= "', mash_max='" . round((floatval($equipment->MASH_VOLUME) / 3) * 10) / 10; // Not in beerxml/brouwhulp. For RIMS systems. | |
| 326 $sql .= "', efficiency='" . floatval($equipment->EFFICIENCY); | 327 $sql .= "', efficiency='" . floatval($equipment->EFFICIENCY); |
| 327 $sql .= "';"; | 328 $sql .= "';"; |
| 328 if (! $result = mysqli_query($db, $sql)) { | 329 if (! $result = mysqli_query($db, $sql)) { |
| 329 printf("Error: %s\n", mysqli_error($db)); | 330 printf("Error: %s\n", mysqli_error($db)); |
| 330 } | 331 } |
| 852 ($recipe->CALC_ACID == "TRUE") ? $sql .= "', calc_acid='1" : $sql .= "', calc_acid='0"; | 853 ($recipe->CALC_ACID == "TRUE") ? $sql .= "', calc_acid='1" : $sql .= "', calc_acid='0"; |
| 853 } | 854 } |
| 854 if ($recipe->TARGET_PH) { | 855 if ($recipe->TARGET_PH) { |
| 855 $sql .= "', mash_ph='" . floatval($recipe->TARGET_PH); | 856 $sql .= "', mash_ph='" . floatval($recipe->TARGET_PH); |
| 856 } | 857 } |
| 857 if ($recipe->SPARGE_ACID_TYPE) { | 858 if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Lactic")) { |
| 858 $sql .= "', sparge_acid_type='" . mysqli_real_escape_string($db, $recipe->SPARGE_ACID_TYPE); | 859 $sql .= "', sparge_acid_type='Melkzuur"; |
| 860 } else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Hydrochloric")) { | |
| 861 $sql .= "', sparge_acid_type='Zoutzuur"; | |
| 862 } else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Phosphoric")) { | |
| 863 $sql .= "', sparge_acid_type='Fosforzuur"; | |
| 864 } else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Sulfuric")) { | |
| 865 $sql .= "', sparge_acid_type='Zwavelzuur"; | |
| 859 } | 866 } |
| 860 if ($recipe->ACID_SPARGE_PERC) { | 867 if ($recipe->ACID_SPARGE_PERC) { |
| 861 $sql .= "', sparge_acid_perc='" . floatval($recipe->ACID_SPARGE_PERC); | 868 $sql .= "', sparge_acid_perc='" . floatval($recipe->ACID_SPARGE_PERC); |
| 862 } | 869 } |
| 863 if ($recipe->LACTIC_SPARGE) { | 870 if ($recipe->LACTIC_SPARGE) { |
| 1041 ($recipe->CALC_ACID == "TRUE") ? $rsql .= "', calc_acid='1" : $rsql .= "', calc_acid='0"; | 1048 ($recipe->CALC_ACID == "TRUE") ? $rsql .= "', calc_acid='1" : $rsql .= "', calc_acid='0"; |
| 1042 } | 1049 } |
| 1043 if ($recipe->TARGET_PH) { | 1050 if ($recipe->TARGET_PH) { |
| 1044 $rsql .= "', mash_ph='" . floatval($recipe->TARGET_PH); | 1051 $rsql .= "', mash_ph='" . floatval($recipe->TARGET_PH); |
| 1045 } | 1052 } |
| 1046 if ($recipe->SPARGE_ACID_TYPE) { | 1053 if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Lactic")) { |
| 1047 $rsql .= "', sparge_acid_type='" . mysqli_real_escape_string($db, $recipe->SPARGE_ACID_TYPE); | 1054 $rsql .= "', sparge_acid_type='Melkzuur"; |
| 1055 } else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Hydrochloric")) { | |
| 1056 $rsql .= "', sparge_acid_type='Zoutzuur"; | |
| 1057 } else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Phosphoric")) { | |
| 1058 $rsql .= "', sparge_acid_type='Fosforzuur"; | |
| 1059 } else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Sulfuric")) { | |
| 1060 $rsql .= "', sparge_acid_type='Zwavelzuur"; | |
| 1048 } | 1061 } |
| 1049 if ($recipe->ACID_SPARGE_PERC) { | 1062 if ($recipe->ACID_SPARGE_PERC) { |
| 1050 $rsql .= "', sparge_acid_perc='" . floatval($recipe->ACID_SPARGE_PERC); | 1063 $rsql .= "', sparge_acid_perc='" . floatval($recipe->ACID_SPARGE_PERC); |
| 1051 } | 1064 } |
| 1052 if ($recipe->LACTIC_SPARGE) { | 1065 if ($recipe->LACTIC_SPARGE) { |
| 1217 $psql .= "', eq_lauter_height='" . floatval($recipe->EQUIPMENT->LAUTER_HEIGHT); | 1230 $psql .= "', eq_lauter_height='" . floatval($recipe->EQUIPMENT->LAUTER_HEIGHT); |
| 1218 $psql .= "', eq_lauter_deadspace='" . floatval($recipe->EQUIPMENT->LAUTER_DEADSPACE); | 1231 $psql .= "', eq_lauter_deadspace='" . floatval($recipe->EQUIPMENT->LAUTER_DEADSPACE); |
| 1219 $psql .= "', eq_kettle_volume='" . floatval($recipe->EQUIPMENT->KETTLE_VOLUME); | 1232 $psql .= "', eq_kettle_volume='" . floatval($recipe->EQUIPMENT->KETTLE_VOLUME); |
| 1220 $psql .= "', eq_kettle_height='" . floatval($recipe->EQUIPMENT->KETTLE_HEIGHT); | 1233 $psql .= "', eq_kettle_height='" . floatval($recipe->EQUIPMENT->KETTLE_HEIGHT); |
| 1221 $psql .= "', eq_mash_volume='" . floatval($recipe->EQUIPMENT->MASH_VOLUME); | 1234 $psql .= "', eq_mash_volume='" . floatval($recipe->EQUIPMENT->MASH_VOLUME); |
| 1235 $psql .= "', eq_mash_max='" . round((floatval($recipe->EQUIPMENT->MASH_VOLUME) / 3) * 10) / 10; // Not in beerxml/brouwhulp. For RIMS systems. | |
| 1222 $psql .= "', eq_efficiency='" . floatval($recipe->EQUIPMENT->EFFICIENCY); | 1236 $psql .= "', eq_efficiency='" . floatval($recipe->EQUIPMENT->EFFICIENCY); |
| 1223 } | 1237 } |
| 1224 | 1238 |
| 1225 if (($recipe->DATE) && (! $recipe->TIME_STARTED) && (! $recipe->TIME_ENDED)) { | 1239 if (($recipe->DATE) && (! $recipe->TIME_STARTED) && (! $recipe->TIME_ENDED)) { |
| 1226 /* We have a plan date but haven't brewed yet, use current date */ | 1240 /* We have a plan date but haven't brewed yet, use current date */ |
