From cd77e380ef3d90d236072d2a7d75d734c5c7990c Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Wed, 22 Nov 2023 11:27:09 +0100 Subject: [PATCH] Read project/version-info from tariff-config ... ... if available --- library/src/configuration.cpp | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/library/src/configuration.cpp b/library/src/configuration.cpp index a6320c3..0c50499 100644 --- a/library/src/configuration.cpp +++ b/library/src/configuration.cpp @@ -88,13 +88,26 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json) const char* mb_name = i->name.GetString(); if (mb_name == NULL) continue; - // if (!document[mb_name].IsArray()) { - std::string const _mb_name(mb_name); - if (_mb_name == "version" || _mb_name == "project" || - _mb_name == "zone" || _mb_name == "info") { + if (document[mb_name].IsString()) { + QString const _mb_name(mb_name); + if (_mb_name.startsWith("Project", Qt::CaseInsensitive)) { + cfg->project.project = document[mb_name].GetString(); + continue; + } + if (_mb_name.startsWith("Version", Qt::CaseInsensitive)) { + cfg->project.version = document[mb_name].GetString(); 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);