--- a/src/ImportXML.cpp Mon Jun 13 15:47:16 2022 +0200
+++ b/src/ImportXML.cpp Mon Jun 13 16:47:52 2022 +0200
@@ -360,11 +360,11 @@
*/
total++;
Fermentables *f = new Fermentables();
- f->f_supplier = f->f_origin = f->f_notes = "";
- f->f_yield = 80;
- f->f_max_in_batch = 100;
- f->f_recommend_mash = true;
- f->f_di_ph = 5.7;
+ f->supplier = f->origin = f->notes = "";
+ f->yield = 80;
+ f->max_in_batch = 100;
+ f->recommend_mash = true;
+ f->di_ph = 5.7;
while (xml->readNext()) {
if (xml->atEnd())
@@ -375,25 +375,25 @@
"moisture=:moisture, diastatic_power=:diastatic, protein=:protein, dissolved_protein=:dissolved, "
"max_in_batch=:maxinbatch, recommend_mash=:mash, added=:added, di_ph=:diph, "
"acid_to_ph_57=:acidph, graintype=:graintype, uuid = :uuid");
- query.bindValue(":name", f->f_name);
- query.bindValue(":type", f->f_type);
- query.bindValue(":yield", QString("%1").arg(f->f_yield, 2, 'f', 1, '0'));
- query.bindValue(":color", QString("%1").arg(Utils::srm_to_ebc(f->f_color), 1, 'f', 0, '0'));
- query.bindValue(":addafter", f->f_add_after_boil ? 1:0);
- query.bindValue(":origin", f->f_origin);
- query.bindValue(":supplier", f->f_supplier);
- query.bindValue(":notes", f->f_notes);
- query.bindValue(":coarse", QString("%1").arg(f->f_coarse_fine_diff, 4, 'f', 3, '0'));
- query.bindValue(":moisture", QString("%1").arg(f->f_moisture, 4, 'f', 3, '0'));
- query.bindValue(":diastatic", Utils::kolbach_to_lintner(f->f_diastatic_power));
- query.bindValue(":protein", QString("%1").arg(f->f_protein, 4, 'f', 3, '0'));
- query.bindValue(":dissolved", QString("%1").arg(f->f_dissolved_protein, 4, 'f', 3, '0'));
- query.bindValue(":maxinbatch", QString("%1").arg(f->f_max_in_batch, 2, 'f', 1, '0'));
- query.bindValue(":mash", f->f_recommend_mash ? 1:0);
- query.bindValue(":added", f->f_added);
- query.bindValue(":diph", QString("%1").arg(f->f_di_ph, 6, 'f', 5, '0'));
- query.bindValue(":acidph", QString("%1").arg(f->f_acid_to_ph_57, 6, 'f', 5, '0'));
- query.bindValue(":graintype", f->f_graintype);
+ query.bindValue(":name", f->name);
+ query.bindValue(":type", f->type);
+ query.bindValue(":yield", QString("%1").arg(f->yield, 2, 'f', 1, '0'));
+ query.bindValue(":color", QString("%1").arg(Utils::srm_to_ebc(f->color), 1, 'f', 0, '0'));
+ query.bindValue(":addafter", f->add_after_boil ? 1:0);
+ query.bindValue(":origin", f->origin);
+ query.bindValue(":supplier", f->supplier);
+ query.bindValue(":notes", f->notes);
+ query.bindValue(":coarse", QString("%1").arg(f->coarse_fine_diff, 4, 'f', 3, '0'));
+ query.bindValue(":moisture", QString("%1").arg(f->moisture, 4, 'f', 3, '0'));
+ query.bindValue(":diastatic", Utils::kolbach_to_lintner(f->diastatic_power));
+ query.bindValue(":protein", QString("%1").arg(f->protein, 4, 'f', 3, '0'));
+ query.bindValue(":dissolved", QString("%1").arg(f->dissolved_protein, 4, 'f', 3, '0'));
+ query.bindValue(":maxinbatch", QString("%1").arg(f->max_in_batch, 2, 'f', 1, '0'));
+ query.bindValue(":mash", f->recommend_mash ? 1:0);
+ query.bindValue(":added", f->added);
+ query.bindValue(":diph", QString("%1").arg(f->di_ph, 6, 'f', 5, '0'));
+ query.bindValue(":acidph", QString("%1").arg(f->acid_to_ph_57, 6, 'f', 5, '0'));
+ query.bindValue(":graintype", f->graintype);
query.bindValue(":uuid", QUuid::createUuid().toString().mid(1, 36));
query.exec();
if (query.lastError().isValid()) {
@@ -410,77 +410,77 @@
(xml->name() == "PERCENTAGE") || (xml->name() == "ADJUST_TO_TOTAL_100") )) {
// Ignore.
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "NAME")) {
- f->f_name = xml->readElementText();
+ f->name = xml->readElementText();
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "TYPE")) {
QString temp = xml->readElementText();
if (temp == "Sugar")
- f->f_type = 1;
+ f->type = 1;
else if (temp == "Extract")
- f->f_type = 2;
+ f->type = 2;
else if (temp == "Dry extract")
- f->f_type = 3;
+ f->type = 3;
else if (temp == "Adjunct")
- f->f_type = 4;
+ f->type = 4;
else
- f->f_type = 0;
+ f->type = 0;
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "ORIGIN")) {
- f->f_origin = xml->readElementText();
+ f->origin = xml->readElementText();
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "SUPPLIER")) {
- f->f_supplier = xml->readElementText();
+ f->supplier = xml->readElementText();
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "NOTES")) {
- f->f_notes = xml->readElementText();
+ f->notes = xml->readElementText();
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "YIELD")) {
- f->f_yield = xml->readElementText().toDouble();
+ f->yield = xml->readElementText().toDouble();
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "COARSE_FINE_DIFF")) {
- f->f_coarse_fine_diff = xml->readElementText().toDouble();
+ f->coarse_fine_diff = xml->readElementText().toDouble();
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "MOISTURE")) {
- f->f_moisture = xml->readElementText().toDouble();
+ f->moisture = xml->readElementText().toDouble();
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "DIASTATIC_POWER")) {
- f->f_diastatic_power = xml->readElementText().toDouble();
+ f->diastatic_power = xml->readElementText().toDouble();
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "MAX_IN_BATCH")) {
- f->f_max_in_batch = xml->readElementText().toDouble();
+ f->max_in_batch = xml->readElementText().toDouble();
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "RECOMMEND_MASH")) {
- f->f_recommend_mash = (xml->readElementText() == "TRUE") ? true:false;
+ f->recommend_mash = (xml->readElementText() == "TRUE") ? true:false;
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "GRAINTYPE")) {
QString temp = xml->readElementText();
if (temp == "Roast")
- f->f_graintype = 1;
+ f->graintype = 1;
else if (temp == "Crystal")
- f->f_graintype = 2;
+ f->graintype = 2;
else if (temp == "Kilned")
- f->f_graintype = 3;
+ f->graintype = 3;
else if (temp == "Sour Malt")
- f->f_graintype = 4;
+ f->graintype = 4;
else if (temp == "Special")
- f->f_graintype = 5;
+ f->graintype = 5;
else if (temp == "No malt")
- f->f_graintype = 6;
+ f->graintype = 6;
else
- f->f_graintype = 0;
+ f->graintype = 0;
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "ADDED")) {
QString temp = xml->readElementText();
if (temp == "Boil")
- f->f_added = 1;
+ f->added = 1;
else if (temp == "Fermentation")
- f->f_added = 2;
+ f->added = 2;
else if (temp == "Lagering")
- f->f_added = 3;
+ f->added = 3;
else if (temp == "Bottle")
- f->f_added = 4;
+ f->added = 4;
else
- f->f_added = 0;
+ f->added = 0;
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "ADD_AFTER_BOIL")) {
- f->f_add_after_boil = (xml->readElementText() == "TRUE") ? true:false;
+ f->add_after_boil = (xml->readElementText() == "TRUE") ? true:false;
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "COLOR")) {
- f->f_color = xml->readElementText().toDouble();
+ f->color = xml->readElementText().toDouble();
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "PROTEIN")) {
- f->f_protein = xml->readElementText().toDouble();
+ f->protein = xml->readElementText().toDouble();
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "DISSOLVED_PROTEIN")) {
- f->f_dissolved_protein = xml->readElementText().toDouble();
+ f->dissolved_protein = xml->readElementText().toDouble();
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "DI_pH")) {
- f->f_di_ph = xml->readElementText().toDouble();
+ f->di_ph = xml->readElementText().toDouble();
} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "ACID_TO_pH_5.7")) {
- f->f_acid_to_ph_57 = xml->readElementText().toDouble();
+ f->acid_to_ph_57 = xml->readElementText().toDouble();
} else {
if (xml->tokenType() == QXmlStreamReader::StartElement)
qDebug() << "2 " << xml->tokenType() << xml->name();