Merge remote-tracking branch 'origin/master' into ticket

[stg.git] / 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 a24f287d7eb4767a3eb464b120917769c4710dd0..4844fd6c77fdbec69de28fe50aa46321c2414e6f 100644 (file)
--- a/stglibs/srvconf.lib/parsers/get_tariff.cpp
+++ b/stglibs/srvconf.lib/parsers/get_tariff.cpp
@@ -97,28 +97,22 @@ else
 return true;
 }
 
 return true;
 }
 

+template <typename T>

 bool GetChangePolicy(const char ** attr, T & value, const std::string & attrName)
 {
 if (!CheckValue(attr, attrName))
     return false;
 std::string type(attr[1]);
 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;
         value = TARIFF::ALLOW;

-        break;
-    case "to_cheap":
+else if (type == "to_cheap")

         value = TARIFF::TO_CHEAP;
         value = TARIFF::TO_CHEAP;

-        break;
-    case "to_expensive":
+else if (type == "to_expensive")

         value = TARIFF::TO_EXPENSIVE;
         value = TARIFF::TO_EXPENSIVE;

-        break;
-    case "deny":
+else if (type == "deny")

         value = TARIFF::DENY;
         value = TARIFF::DENY;

-        break;
-    default:
-        return false;
-    }
+else
+    return false;

 return true;
 }
 
 return true;
 }
 


@@ -156,6 +150,7 @@ GET_TARIFF::PARSER::PARSER(CALLBACK f, void * d, const std::string & e)
     AddParser(propertyParsers, "free", info.tariffConf.free);
     AddParser(propertyParsers, "traffType", info.tariffConf.traffType, GetTraffType);
     AddParser(propertyParsers, "period", info.tariffConf.period, GetPeriod);
     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);

     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);
     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);