X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/6c05b2e63b58b19df2f35707fa12f238a18458e7..1a21bad6c7e114808ad31d526fd5f12040afb467:/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 993f8b50..1bb9d0db 100644
--- a/stglibs/srvconf.lib/parsers/get_tariff.cpp
+++ b/stglibs/srvconf.lib/parsers/get_tariff.cpp
@@ -24,7 +24,6 @@
 
 #include "stg/common.h"
 
-#include <map>
 #include <utility>
 
 #include <strings.h>
@@ -40,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) { return func(attr, array, field); }
+        virtual bool Parse(const char ** attr, const std::string & /*attrName*/) { return func(attr, array, field); }
     private:
         A & array;
         T A::value_type:: * field;
@@ -54,13 +53,13 @@ void AddAOSParser(PROPERTY_PARSERS & parsers, const std::string & name, A & arra
     parsers.insert(std::make_pair(ToLower(name), new AOS_PARSER<A, T>(array, field, func)));
 }
 
-bool GetTimeSpan(const char ** attr, DIRPRICE_DATA & value)
+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))
+if (CheckValue(attr, attrName))
     if (ParseTariffTimeStr(attr[1], hb, mb, he, me) == 0)
         {
         value.hDay = hb;
@@ -73,9 +72,9 @@ return false;
 }
 
 template <typename T>
-bool GetTraffType(const char ** attr, T & value)
+bool GetTraffType(const char ** attr, T & value, const std::string & attrName)
 {
-if (!CheckValue(attr))
+if (!CheckValue(attr, attrName))
     return false;
 std::string type(attr[1]);
 if (type == "up")
@@ -91,10 +90,25 @@ 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)
 {
-if (!CheckValue(attr))
+if (!CheckValue(attr, "value"))
     return false;
 const char * start = attr[1];
 size_t item = 0;
@@ -123,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);
@@ -131,6 +146,7 @@ GET_TARIFF::PARSER::PARSER(CALLBACK f, void * d)
     AddAOSParser(propertyParsers, "priceNightB", info.dirPrice, &DIRPRICE_DATA::priceNightB, GetSlashedValue);
     AddAOSParser(propertyParsers, "singlePrice", info.dirPrice, &DIRPRICE_DATA::singlePrice, GetSlashedValue);
     AddAOSParser(propertyParsers, "noDiscount", info.dirPrice, &DIRPRICE_DATA::noDiscount, GetSlashedValue);
+    AddAOSParser(propertyParsers, "threshold", info.dirPrice, &DIRPRICE_DATA::threshold, GetSlashedValue);
 }
 //-----------------------------------------------------------------------------
 GET_TARIFF::PARSER::~PARSER()
@@ -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 + "'.";
 }