X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/21baffc9c880ba71baaddad5c4cf2b32352823ff..51998949e60e2a7e86e4393b315cfb76a58ca80d:/projects/stargazer/plugins/configuration/sgconfig/parser_tariffs.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_tariffs.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_tariffs.cpp index 9c752674..8f8e8db5 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_tariffs.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_tariffs.cpp @@ -23,7 +23,7 @@ #include "stg/tariffs.h" #include "stg/users.h" -#include "stg/resetable.h" +#include "stg/optional.h" #include // snprintf #include @@ -51,13 +51,13 @@ std::string AOS2String(const A & array, size_t size, const F C::* field, F multi { if (!res.empty()) res += "/"; - res += x2str((array[i].*field) * multiplier); + res += std::to_string((array[i].*field) * multiplier); } return res; } template -bool str2res(const std::string& source, RESETABLE& dest, T divisor) +bool str2res(const std::string& source, STG::Optional& dest, T divisor) { T value = 0; if (str2x(source, value)) @@ -67,7 +67,7 @@ bool str2res(const std::string& source, RESETABLE& dest, T divisor) } template -bool String2AOS(const std::string & source, A & array, size_t size, RESETABLE C::* field, F divisor) +bool String2AOS(const std::string & source, A & array, size_t size, STG::Optional C::* field, F divisor) { size_t index = 0; std::string::size_type from = 0; @@ -90,32 +90,32 @@ void GET_TARIFFS::CreateAnswer() { m_answer = ""; - std::list dataList; + std::vector dataList; m_tariffs.GetTariffsData(&dataList); - std::list::const_iterator it = dataList.begin(); + auto it = dataList.begin(); for (; it != dataList.end(); ++it) { m_answer += "tariffConf.name + "\">"; for (size_t i = 0; i < DIR_NUM; i++) - m_answer += "dirPrice[i].hDay) + ":" + x2str(it->dirPrice[i].mDay) + "-" + - x2str(it->dirPrice[i].hNight) + ":" + x2str(it->dirPrice[i].mNight) + "\"/>"; - - m_answer += "dirPrice, DIR_NUM, &DIRPRICE_DATA::priceDayA, pt_mega) + "\"/>" + - "dirPrice, DIR_NUM, &DIRPRICE_DATA::priceDayB, pt_mega) + "\"/>" + - "dirPrice, DIR_NUM, &DIRPRICE_DATA::priceNightA, pt_mega) + "\"/>" + - "dirPrice, DIR_NUM, &DIRPRICE_DATA::priceNightB, pt_mega) + "\"/>" + - "dirPrice, DIR_NUM, &DIRPRICE_DATA::threshold, 1) + "\"/>" + - "dirPrice, DIR_NUM, &DIRPRICE_DATA::singlePrice, 1) + "\"/>" + - "dirPrice, DIR_NUM, &DIRPRICE_DATA::noDiscount, 1) + "\"/>" + - "tariffConf.fee) + "\"/>" + - "tariffConf.passiveCost) + "\"/>" + - "tariffConf.free) + "\"/>" + - "tariffConf.traffType) + "\"/>" + - "tariffConf.period) + "\"/>" + - "tariffConf.changePolicy) + "\"/>" + - "tariffConf.changePolicyTimeout) + "\"/>" + + m_answer += "dirPrice[i].hDay) + ":" + std::to_string(it->dirPrice[i].mDay) + "-" + + std::to_string(it->dirPrice[i].hNight) + ":" + std::to_string(it->dirPrice[i].mNight) + "\"/>"; + + m_answer += "dirPrice, DIR_NUM, &DirPriceData::priceDayA, pt_mega) + "\"/>" + + "dirPrice, DIR_NUM, &DirPriceData::priceDayB, pt_mega) + "\"/>" + + "dirPrice, DIR_NUM, &DirPriceData::priceNightA, pt_mega) + "\"/>" + + "dirPrice, DIR_NUM, &DirPriceData::priceNightB, pt_mega) + "\"/>" + + "dirPrice, DIR_NUM, &DirPriceData::threshold, 1) + "\"/>" + + "dirPrice, DIR_NUM, &DirPriceData::singlePrice, 1) + "\"/>" + + "dirPrice, DIR_NUM, &DirPriceData::noDiscount, 1) + "\"/>" + + "tariffConf.fee) + "\"/>" + + "tariffConf.passiveCost) + "\"/>" + + "tariffConf.free) + "\"/>" + + "tariffConf.traffType) + "\"/>" + + "tariffConf.period) + "\"/>" + + "tariffConf.changePolicy) + "\"/>" + + "tariffConf.changePolicyTimeout) + "\"/>" + ""; } @@ -172,7 +172,7 @@ int CHG_TARIFF::Start(void *, const char * el, const char ** attr) { if (strcasecmp(el, m_tag.c_str()) == 0) { - const TARIFF * tariff = m_tariffs.FindByName(attr[1]); + const auto tariff = m_tariffs.FindByName(attr[1]); if (tariff != NULL) td = tariff->GetTariffData(); else @@ -184,7 +184,7 @@ int CHG_TARIFF::Start(void *, const char * el, const char ** attr) { if (strcasecmp(el, "PriceDayA") == 0) { - if (!String2AOS(attr[1], td.dirPrice, DIR_NUM, &DIRPRICE_DATA_RES::priceDayA, pt_mega)) + if (!String2AOS(attr[1], td.dirPrice, DIR_NUM, &DirPriceDataOpt::priceDayA, pt_mega)) return -1; // TODO: log it else return 0; @@ -192,7 +192,7 @@ int CHG_TARIFF::Start(void *, const char * el, const char ** attr) if (strcasecmp(el, "PriceDayB") == 0) { - if (!String2AOS(attr[1], td.dirPrice, DIR_NUM, &DIRPRICE_DATA_RES::priceDayB, pt_mega)) + if (!String2AOS(attr[1], td.dirPrice, DIR_NUM, &DirPriceDataOpt::priceDayB, pt_mega)) return -1; // TODO: log it else return 0; @@ -200,7 +200,7 @@ int CHG_TARIFF::Start(void *, const char * el, const char ** attr) if (strcasecmp(el, "PriceNightA") == 0) { - if (!String2AOS(attr[1], td.dirPrice, DIR_NUM, &DIRPRICE_DATA_RES::priceNightA, pt_mega)) + if (!String2AOS(attr[1], td.dirPrice, DIR_NUM, &DirPriceDataOpt::priceNightA, pt_mega)) return -1; // TODO: log it else return 0; @@ -208,7 +208,7 @@ int CHG_TARIFF::Start(void *, const char * el, const char ** attr) if (strcasecmp(el, "PriceNightB") == 0) { - if (!String2AOS(attr[1], td.dirPrice, DIR_NUM, &DIRPRICE_DATA_RES::priceNightB, pt_mega)) + if (!String2AOS(attr[1], td.dirPrice, DIR_NUM, &DirPriceDataOpt::priceNightB, pt_mega)) return -1; // TODO: log it else return 0; @@ -216,7 +216,7 @@ int CHG_TARIFF::Start(void *, const char * el, const char ** attr) if (strcasecmp(el, "Threshold") == 0) { - if (!String2AOS(attr[1], td.dirPrice, DIR_NUM, &DIRPRICE_DATA_RES::threshold, 1)) + if (!String2AOS(attr[1], td.dirPrice, DIR_NUM, &DirPriceDataOpt::threshold, 1)) return -1; // TODO: log it else return 0; @@ -224,7 +224,7 @@ int CHG_TARIFF::Start(void *, const char * el, const char ** attr) if (strcasecmp(el, "SinglePrice") == 0) { - if (!String2AOS(attr[1], td.dirPrice, DIR_NUM, &DIRPRICE_DATA_RES::singlePrice, 1)) + if (!String2AOS(attr[1], td.dirPrice, DIR_NUM, &DirPriceDataOpt::singlePrice, 1)) return -1; // TODO: log it else return 0; @@ -232,7 +232,7 @@ int CHG_TARIFF::Start(void *, const char * el, const char ** attr) if (strcasecmp(el, "NoDiscount") == 0) { - if (!String2AOS(attr[1], td.dirPrice, DIR_NUM, &DIRPRICE_DATA_RES::noDiscount, 1)) + if (!String2AOS(attr[1], td.dirPrice, DIR_NUM, &DirPriceDataOpt::noDiscount, 1)) return -1; // TODO: log it else return 0; @@ -285,19 +285,19 @@ int CHG_TARIFF::Start(void *, const char * el, const char ** attr) if (strcasecmp(el, "TraffType") == 0) { - td.tariffConf.traffType = TARIFF::StringToTraffType(attr[1]); + td.tariffConf.traffType = Tariff::parseTraffType(attr[1]); return 0; } if (strcasecmp(el, "Period") == 0) { - td.tariffConf.period = TARIFF::StringToPeriod(attr[1]); + td.tariffConf.period = Tariff::parsePeriod(attr[1]); return 0; } if (strcasecmp(el, "ChangePolicy") == 0) { - td.tariffConf.changePolicy = TARIFF::StringToChangePolicy(attr[1]); + td.tariffConf.changePolicy = Tariff::parseChangePolicy(attr[1]); return 0; } @@ -316,7 +316,7 @@ void CHG_TARIFF::CreateAnswer() { if (!td.tariffConf.name.data().empty()) { - TARIFF_DATA tariffData = td.GetData(); + auto tariffData = td.get({}); if (m_tariffs.Chg(tariffData, &m_currAdmin) == 0) m_answer = "<" + m_tag + " Result=\"ok\"/>"; else