GerhardHoffmann/MOBILISIS-Calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Read project/version-info from tariff-config ...

Browse Source 
... if available
This commit is contained in:
Siegfried Siegert 2023-11-22 11:27:09 +01:00
parent aaa4348a9a
commit cd77e380ef
Signed by: SiegfriedSiegert
GPG Key ID: 68371E015E8F0B03
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
library/src/configuration.cpp
View File

@ -88,13 +88,26 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
const char* mb_name = i->name.GetString(); const char* mb_name = i->name.GetString();
if (mb_name == NULL) continue; if (mb_name == NULL) continue;
// if (!document[mb_name].IsArray()) { if (document[mb_name].IsString()) {
std::string const _mb_name(mb_name); QString const _mb_name(mb_name);
if (_mb_name == "version" || _mb_name == "project" || if (_mb_name.startsWith("Project", Qt::CaseInsensitive)) {
_mb_name == "zone" || _mb_name == "info") { cfg->project.project = document[mb_name].GetString();
continue;
}
if (_mb_name.startsWith("Version", Qt::CaseInsensitive)) {
cfg->project.version = document[mb_name].GetString();
continue; continue;
} }
// } if (_mb_name.startsWith("Info", Qt::CaseInsensitive)) {
cfg->project.info = document[mb_name].GetString();
continue;
}
}
// ... everything else should be an array
if (!document[mb_name].IsArray()) {
continue;
}
//printf(" -%s\n", mb_name); //printf(" -%s\n", mb_name);