X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9b3f8c7252b92a7b32996aa3c2b5e5c16361c82d..8c6fa3fbaccc22127280bf77a48fab5a3ee0716e:/stglibs/srvconf.lib/parsers/get_tariff.cpp diff --git a/stglibs/srvconf.lib/parsers/get_tariff.cpp b/stglibs/srvconf.lib/parsers/get_tariff.cpp index 75b6b462..a13205b3 100644 --- a/stglibs/srvconf.lib/parsers/get_tariff.cpp +++ b/stglibs/srvconf.lib/parsers/get_tariff.cpp @@ -103,23 +103,16 @@ bool GetChangePolicy(const char ** attr, T & value, const std::string & attrName if (!CheckValue(attr, attrName)) return false; std::string type(attr[1]); -switch (type) - { - case "allow": +if (type == "allow") value = TARIFF::ALLOW; - break; - case "to_cheap": +else if (type == "to_cheap") value = TARIFF::TO_CHEAP; - break; - case "to_expensive": +else if (type == "to_expensive") value = TARIFF::TO_EXPENSIVE; - break; - case "deny": +else if (type == "deny") value = TARIFF::DENY; - break; - default: - return false; - } +else + return false; return true; } @@ -158,6 +151,7 @@ GET_TARIFF::PARSER::PARSER(CALLBACK f, void * d, const std::string & e) AddParser(propertyParsers, "traffType", info.tariffConf.traffType, GetTraffType); AddParser(propertyParsers, "period", info.tariffConf.period, GetPeriod); AddParser(propertyParsers, "changePolicy", info.tariffConf.changePolicy, GetChangePolicy); + AddParser(propertyParsers, "changePolicyTimeout", info.tariffConf.changePolicyTimeout); for (size_t i = 0; i < DIR_NUM; ++i) AddParser(propertyParsers, "time" + unsigned2str(i), info.dirPrice[i], GetTimeSpan); AddAOSParser(propertyParsers, "priceDayA", info.dirPrice, &DIRPRICE_DATA::priceDayA, GetSlashedValue);