X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/20d884ddac6b8cacedb2701e282efe3ff9785cbf..0eb93798fdb7b37b7d43b92b5166e0ca4dac98b9:/stglibs/srvconf.lib/parsers/get_tariff.cpp?ds=sidebyside

diff --git a/stglibs/srvconf.lib/parsers/get_tariff.cpp b/stglibs/srvconf.lib/parsers/get_tariff.cpp
index eb94441e..1bb9d0db 100644
--- a/stglibs/srvconf.lib/parsers/get_tariff.cpp
+++ b/stglibs/srvconf.lib/parsers/get_tariff.cpp
@@ -90,6 +90,21 @@ else
 return true;
 }
 
+template <typename T>
+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 <typename A, typename T>
 bool GetSlashedValue(const char ** attr, A & array, T A::value_type:: * field)
 {
@@ -122,6 +137,7 @@ 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);
     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);
@@ -178,7 +194,11 @@ if (strcasecmp(el, "tariff") == 0)
                 error = "Tariff not found.";
             }
         else
+            {
             parsingAnswer = true;
+            if (strcasecmp(attr[0], "name") == 0)
+                info.tariffConf.name = attr[1];
+            }
         }
     else
         parsingAnswer = true;
@@ -188,5 +208,5 @@ if (strcasecmp(el, "tariff") == 0)
 void GET_TARIFF::PARSER::ParseTariffParams(const char * el, const char ** attr)
 {
 if (!TryParse(propertyParsers, ToLower(el), attr))
-    error = "Invalid parameter.";
+    error = std::string("Invalid parameter '") + el + "'.";
 }