Ticket 12. The 'StopOnError' parameter added.

[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 80bb4cb2dcc87c50a1c220066394815e4b180076..158e6f890642af0a744525691ea825774e429901 100644 (file)
--- a/stglibs/srvconf.lib/parsers/chg_tariff.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_tariff.cpp
@@ -55,18 +55,12 @@ std::string CHG_TARIFF::Serialize(const TARIFF_DATA_RES & data, const std::strin
 {
 std::ostringstream stream;
 
 {
 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())
 
 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())
 
 if (!data.tariffConf.period.empty())
     switch (data.tariffConf.period.data())