X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/01cdd74060b063287784d3aff7f9f861a404b789..b339e207d5ee50c2766c04eb71904f28875e50ce:/stglibs/srvconf.lib/parsers/get_tariff.cpp?ds=inline diff --git a/stglibs/srvconf.lib/parsers/get_tariff.cpp b/stglibs/srvconf.lib/parsers/get_tariff.cpp index 9ab61638..e2066363 100644 --- a/stglibs/srvconf.lib/parsers/get_tariff.cpp +++ b/stglibs/srvconf.lib/parsers/get_tariff.cpp @@ -39,7 +39,7 @@ class AOS_PARSER : public BASE_PROPERTY_PARSER public: typedef bool (* FUNC)(const char **, A &, T A::value_type:: *); AOS_PARSER(A & a, T A::value_type:: * fld, FUNC f) : array(a), field(fld), func(f) {} - virtual bool Parse(const char ** attr, const std::string & /*attrName*/) { return func(attr, array, field); } + virtual bool Parse(const char ** attr, const std::string & /*attrName*/, const std::string & /*fromEncoding*/) { return func(attr, array, field); } private: A & array; T A::value_type:: * field; @@ -55,11 +55,12 @@ void AddAOSParser(PROPERTY_PARSERS & parsers, const std::string & name, A & arra bool GetTimeSpan(const char ** attr, DIRPRICE_DATA & value, const std::string & attrName) { -int hb = 0; -int mb = 0; -int he = 0; -int me = 0; if (CheckValue(attr, attrName)) + { + int hb = 0; + int mb = 0; + int he = 0; + int me = 0; if (ParseTariffTimeStr(attr[1], hb, mb, he, me) == 0) { value.hDay = hb; @@ -68,28 +69,62 @@ if (CheckValue(attr, attrName)) value.mNight = me; return true; } + } return false; } template bool GetTraffType(const char ** attr, T & value, const std::string & attrName) { +if (!CheckValue(attr, attrName)) + return false; +value = TARIFF::StringToTraffType(attr[1]); +return true; +} + +template +bool GetPeriod(const char ** attr, T & value, const std::string & attrName) +{ +if (!CheckValue(attr, attrName)) + return false; +std::string type(attr[1]); +if (type == "day") + value = TARIFF::DAY; +else if (type == "month") + value = TARIFF::MONTH; +else + return false; +return true; +} + +template +bool GetChangePolicy(const char ** attr, T & value, const std::string & attrName) +{ if (!CheckValue(attr, attrName)) return false; std::string type(attr[1]); -if (type == "up") - value = TRAFF_UP; -else if (type == "down") - value = TRAFF_DOWN; -else if (type == "up+down") - value = TRAFF_UP_DOWN; -else if (type == "max") - value = TRAFF_MAX; +if (type == "allow") + value = TARIFF::ALLOW; +else if (type == "to_cheap") + value = TARIFF::TO_CHEAP; +else if (type == "to_expensive") + value = TARIFF::TO_EXPENSIVE; +else if (type == "deny") + value = TARIFF::DENY; else return false; return true; } +template +bool GetChangePolicyTimeout(const char ** attr, T & value, const std::string & attrName) +{ +if (!CheckValue(attr, attrName)) + return false; +value = readTime(attr[1]); +return true; +} + template bool GetSlashedValue(const char ** attr, A & array, T A::value_type:: * field) { @@ -112,9 +147,10 @@ return true; } // namespace anonymous -GET_TARIFF::PARSER::PARSER(CALLBACK f, void * d) +GET_TARIFF::PARSER::PARSER(CALLBACK f, void * d, const std::string & e) : callback(f), data(d), + encoding(e), depth(0), parsingAnswer(false) { @@ -122,6 +158,9 @@ GET_TARIFF::PARSER::PARSER(CALLBACK f, void * d) AddParser(propertyParsers, "passiveCost", info.tariffConf.passiveCost); AddParser(propertyParsers, "free", info.tariffConf.free); 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, GetChangePolicyTimeout); 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); @@ -191,6 +230,6 @@ if (strcasecmp(el, "tariff") == 0) //----------------------------------------------------------------------------- void GET_TARIFF::PARSER::ParseTariffParams(const char * el, const char ** attr) { -if (!TryParse(propertyParsers, ToLower(el), attr)) +if (!TryParse(propertyParsers, ToLower(el), attr, encoding)) error = std::string("Invalid parameter '") + el + "'."; }