comparison: www/includes/db_recipes.php
www/includes/db_recipes.php
- changeset 565
- dfc850e6ee1f
- parent 559
- 10cc2400b5d5
- child 667
- 1246550451ca
equal
deleted
inserted
replaced
| 564:d5fad7d80899 | 565:dfc850e6ee1f |
|---|---|
| 291 $yeast .= ',"y_harvest_time":' . $item['y_harvest_time']; | 291 $yeast .= ',"y_harvest_time":' . $item['y_harvest_time']; |
| 292 $yeast .= ',"y_pitch_temperature":' . $item['y_pitch_temperature']; | 292 $yeast .= ',"y_pitch_temperature":' . $item['y_pitch_temperature']; |
| 293 $yeast .= ',"y_pofpos":' . $item['y_pofpos']; | 293 $yeast .= ',"y_pofpos":' . $item['y_pofpos']; |
| 294 $yeast .= ',"y_zymocide":' . $item['y_zymocide']; | 294 $yeast .= ',"y_zymocide":' . $item['y_zymocide']; |
| 295 $yeast .= ',"y_cost":' . $item['y_cost'] . '}'; | 295 $yeast .= ',"y_cost":' . $item['y_cost'] . '}'; |
| 296 //syslog(LOG_NOTICE, $yeast); | 296 syslog(LOG_NOTICE, $yeast); |
| 297 $yeasts .= $yeast; | 297 $yeasts .= $yeast; |
| 298 } | 298 } |
| 299 } | 299 } |
| 300 $yeasts .= ']'; | 300 $yeasts .= ']'; |
| 301 $sql .= "', json_yeasts='" . $yeasts; | 301 $sql .= "', json_yeasts='" . $yeasts; |
| 550 $yeasts[$i]['y_pitch_temperature'] = floatval($obj->pitch_temperature); | 550 $yeasts[$i]['y_pitch_temperature'] = floatval($obj->pitch_temperature); |
| 551 if (! isset($yeasts[$i]['y_pofpos'])) | 551 if (! isset($yeasts[$i]['y_pofpos'])) |
| 552 $yeasts[$i]['y_pofpos'] = intval($obj->pofpos); | 552 $yeasts[$i]['y_pofpos'] = intval($obj->pofpos); |
| 553 if (! isset($yeasts[$i]['y_zymocide'])) | 553 if (! isset($yeasts[$i]['y_zymocide'])) |
| 554 $yeasts[$i]['y_zymocide'] = intval($obj->zymocide); | 554 $yeasts[$i]['y_zymocide'] = intval($obj->zymocide); |
| 555 } else { | |
| 556 if (! isset($yeasts[$i]['y_sta1'])) | |
| 557 $yeasts[$i]['y_sta1'] = 0; | |
| 558 if (! isset($yeasts[$i]['y_bacteria'])) | |
| 559 $yeasts[$i]['y_bacteria'] = 0; | |
| 560 if (! isset($yeasts[$i]['y_harvest_top'])) | |
| 561 $yeasts[$i]['y_harvest_top'] = 0; | |
| 562 if (! isset($yeasts[$i]['y_harvest_time'])) | |
| 563 $yeasts[$i]['y_harvest_time'] = 0; | |
| 564 if (! isset($yeasts[$i]['y_pitch_temperature'])) | |
| 565 $yeasts[$i]['y_pitch_temperature'] = 0; | |
| 566 if (! isset($yeasts[$i]['y_pofpos'])) | |
| 567 $yeasts[$i]['y_pofpos'] = 0; | |
| 568 if (! isset($yeasts[$i]['y_zymocide'])) | |
| 569 $yeasts[$i]['y_zymocide'] = 0; | |
| 555 } | 570 } |
| 556 mysqli_free_result($result2); | 571 mysqli_free_result($result2); |
| 557 } | 572 } |
| 558 } | 573 } |
| 574 syslog(LOG_NOTICE, json_encode($yeasts, JSON_UNESCAPED_UNICODE)); | |
| 559 $recipes .= ',"yeasts":' . json_encode($yeasts, JSON_UNESCAPED_UNICODE); | 575 $recipes .= ',"yeasts":' . json_encode($yeasts, JSON_UNESCAPED_UNICODE); |
| 560 } else { | 576 } else { |
| 561 // Just leave it. | 577 // Just leave it. |
| 562 $recipes .= ',"fermentables":' . $row['json_fermentables']; | 578 $recipes .= ',"fermentables":' . $row['json_fermentables']; |
| 563 $recipes .= ',"hops":' . $row['json_hops']; | 579 $recipes .= ',"hops":' . $row['json_hops']; |
