From 10b018a3387e1d09f095a97c78acc7a7821b8cba Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 7 Nov 2023 14:43:26 +0100 Subject: [PATCH] Lower restrictions when parsing json-files (needed for Schoenau, as there are no special days.) --- library/src/configuration.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/library/src/configuration.cpp b/library/src/configuration.cpp index 59cd6e8..4d41720 100644 --- a/library/src/configuration.cpp +++ b/library/src/configuration.cpp @@ -34,8 +34,8 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json) } // Parse JSON to document - Document document; - document.Parse(json); + Document document; + document.Parse(json); // Return if parse error has been found ParseErrorCode err = document.GetParseError(); @@ -55,13 +55,13 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json) // Validate JSON, check configuration members if (!document.HasMember("Currency") - || !document.HasMember("PaymentMethod") - || !document.HasMember("PaymentOption") - || !document.HasMember("PaymentRate") - || !document.HasMember("Duration") - //|| !document.HasMember("WeekDays") - || !document.HasMember("SpecialDaysWorktime") - || !document.HasMember("SpecialDays")) + || !document.HasMember("PaymentMethod") + || !document.HasMember("PaymentOption") + || !document.HasMember("PaymentRate") + || !document.HasMember("Duration")) +//|| !document.HasMember("WeekDays") +//|| !document.HasMember("SpecialDaysWorktime") +//|| !document.HasMember("SpecialDays")) { printf("%s", "Error: not a valid configuration JSON\n"); return false;