Ticket. The time_t currentTime parameter added in

[stg.git] / stglibs / srvconf.lib / parsers / chg_tariff.cpp

diff --git a/stglibs/srvconf.lib/parsers/chg_tariff.cpp b/stglibs/srvconf.lib/parsers/chg_tariff.cpp
index b2bc52d6f8f548abd16f7ab7924ac63b1222f722..16c4b198dbf1d4e605de0a51d22c39f46abf8d4e 100644 (file)
--- a/stglibs/srvconf.lib/parsers/chg_tariff.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_tariff.cpp
@@ -51,22 +51,16 @@ stream << "<" << name << " value=\"" << res << "\"/>";
 
 } // namespace anonymous
 
-std::string CHG_TARIFF::Serialize(const TARIFF_DATA_RES & data)
+std::string CHG_TARIFF::Serialize(const TARIFF_DATA_RES & data, const std::string & /*encoding*/)
 {
 std::ostringstream stream;
 
-appendResetable(stream, "fee", data.tariffConf.fee);
-appendResetable(stream, "passiveCost", data.tariffConf.passiveCost);
-appendResetable(stream, "free", data.tariffConf.free);
+appendResetableTag(stream, "fee", data.tariffConf.fee);
+appendResetableTag(stream, "passiveCost", data.tariffConf.passiveCost);
+appendResetableTag(stream, "free", data.tariffConf.free);
 
 if (!data.tariffConf.traffType.empty())
-    switch (data.tariffConf.traffType.data())
-        {
-        case TRAFF_UP: stream << "<traffType value=\"up\"/>"; break;
-        case TRAFF_DOWN: stream << "<traffType value=\"down\"/>"; break;
-        case TRAFF_UP_DOWN: stream << "<traffType value=\"up+down\"/>"; break;
-        case TRAFF_MAX: stream << "<traffType value=\"max\"/>"; break;
-        }
+    stream << "<traffType value=\"" + TARIFF::TraffTypeToString(data.tariffConf.traffType.data()) + "\"/>";
 
 if (!data.tariffConf.period.empty())
     switch (data.tariffConf.period.data())
@@ -75,6 +69,16 @@ if (!data.tariffConf.period.empty())
         case TARIFF::MONTH: stream << "<period value=\"month\"/>"; break;
         }
 
+if (!data.tariffConf.changePolicy.empty())
+    switch (data.tariffConf.changePolicy.data())
+        {
+        case TARIFF::ALLOW: stream << "<changePolicy value=\"allow\"/>"; break;
+        case TARIFF::TO_CHEAP: stream << "<changePolicy value=\"to_cheap\"/>"; break;
+        case TARIFF::TO_EXPENSIVE: stream << "<changePolicy value=\"to_expensive\"/>"; break;
+        case TARIFF::DENY: stream << "<changePolicy value=\"deny\"/>"; break;
+        }
+
+appendResetableTag(stream, "changePolicyTimeout", data.tariffConf.changePolicyTimeout);
 for (size_t i = 0; i < DIR_NUM; ++i)
     if (!data.dirPrice[i].hDay.empty() &&
         !data.dirPrice[i].mDay.empty() &&