comparison: www/import/from_brouwhulp.php
www/import/from_brouwhulp.php
- changeset 114
- 4935e86b2775
- parent 111
- 8c4ba91adf58
- child 118
- 07daa505d309
equal
deleted
inserted
replaced
| 113:982c9ae73e12 | 114:4935e86b2775 |
|---|---|
| 1121 printf("Error: %s\n", mysqli_error($db)); | 1121 printf("Error: %s\n", mysqli_error($db)); |
| 1122 } | 1122 } |
| 1123 $count = mysqli_affected_rows($db); | 1123 $count = mysqli_affected_rows($db); |
| 1124 if ($count > 0) { | 1124 if ($count > 0) { |
| 1125 $psql .= "', log_fermentation='1"; | 1125 $psql .= "', log_fermentation='1"; |
| 1126 } else { | |
| 1127 // See if there really are no records | |
| 1128 $sql = "SELECT product_code FROM log_fermentation WHERE product_code='".$recipe->NR_RECIPE."';"; | |
| 1129 $count = mysqli_affected_rows($db); | |
| 1130 if ($count > 0) { | |
| 1131 $psql .= "', log_fermentation='1"; | |
| 1132 } | |
| 1126 } | 1133 } |
| 1127 | 1134 |
| 1128 /* | 1135 /* |
| 1129 * If no external fermentation log is found, check for an internal one. | 1136 * If no external fermentation log is found, check for an internal one. |
| 1130 */ | 1137 */ |
| 1161 $psql .= "', eq_tun_material='" . mysqli_real_escape_string($db, $recipe->EQUIPMENT->TUN_MATERIAL); | 1168 $psql .= "', eq_tun_material='" . mysqli_real_escape_string($db, $recipe->EQUIPMENT->TUN_MATERIAL); |
| 1162 $psql .= "', eq_tun_height='" . floatval($recipe->EQUIPMENT->TUN_HEIGHT); | 1169 $psql .= "', eq_tun_height='" . floatval($recipe->EQUIPMENT->TUN_HEIGHT); |
| 1163 if ($recipe->EQUIPMENT->TOP_UP_WATER) | 1170 if ($recipe->EQUIPMENT->TOP_UP_WATER) |
| 1164 $psql .= "', eq_top_up_water='" . floatval($recipe->EQUIPMENT->TOP_UP_WATER); | 1171 $psql .= "', eq_top_up_water='" . floatval($recipe->EQUIPMENT->TOP_UP_WATER); |
| 1165 $psql .= "', eq_trub_chiller_loss='" . floatval($recipe->EQUIPMENT->TRUB_CHILLER_LOSS); | 1172 $psql .= "', eq_trub_chiller_loss='" . floatval($recipe->EQUIPMENT->TRUB_CHILLER_LOSS); |
| 1166 $psql .= "', eq_evap_rate='" . floatval($recipe->EQUIPMENT->EVAP_RATE); | 1173 /* |
| 1174 * Brouwhulp uses a percentage for the evaporation rate. This is wrong | |
| 1175 * but was made so because the beerxml standard requires this. What we | |
| 1176 * do is calculate the actual evaporation and store that. | |
| 1177 * This is what we use. Brouwhulp calculates this on the fly. | |
| 1178 */ | |
| 1179 $psql .= "', eq_evap_rate='" . (floatval($recipe->EQUIPMENT->EVAP_RATE) * floatval($recipe->EQUIPMENT->BOIL_SIZE)) / 100; | |
| 1167 $psql .= "', eq_boil_time='" . floatval($recipe->EQUIPMENT->BOIL_TIME); | 1180 $psql .= "', eq_boil_time='" . floatval($recipe->EQUIPMENT->BOIL_TIME); |
| 1168 ($recipe->EQUIPMENT->CALC_BOIL_VOLUME == 'TRUE') ? $psql .= "', eq_calc_boil_volume='1" : $psql .= "', eq_calc_boil_volume='0"; | 1181 ($recipe->EQUIPMENT->CALC_BOIL_VOLUME == 'TRUE') ? $psql .= "', eq_calc_boil_volume='1" : $psql .= "', eq_calc_boil_volume='0"; |
| 1169 if ($recipe->EQUIPMENT->TOP_UP_KETTLE) | 1182 if ($recipe->EQUIPMENT->TOP_UP_KETTLE) |
| 1170 $psql .= "', eq_top_up_kettle='" . floatval($recipe->EQUIPMENT->TOP_UP_KETTLE); | 1183 $psql .= "', eq_top_up_kettle='" . floatval($recipe->EQUIPMENT->TOP_UP_KETTLE); |
| 1171 $psql .= "', eq_hop_utilization='" . floatval($recipe->EQUIPMENT->HOP_UTILIZATION); | 1184 $psql .= "', eq_hop_utilization='" . floatval($recipe->EQUIPMENT->HOP_UTILIZATION); |
