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 cb7d9475b2e8af3100ddc2cb3b463a5bd9dddf76..158e6f890642af0a744525691ea825774e429901 100644 (file)
--- a/stglibs/srvconf.lib/parsers/chg_tariff.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_tariff.cpp
@@ -51,21 +51,22 @@ stream << "<" << name << " value=\"" << res << "\"/>";
 
 } // namespace anonymous
 
 
 } // 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;
 
 {
 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())
+    stream << "<traffType value=\"" + TARIFF::TraffTypeToString(data.tariffConf.traffType.data()) + "\"/>";
+
+if (!data.tariffConf.period.empty())
+    switch (data.tariffConf.period.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;
+        case TARIFF::DAY: stream << "<period value=\"day\"/>"; break;
+        case TARIFF::MONTH: stream << "<period value=\"month\"/>"; break;

         }
 
 for (size_t i = 0; i < DIR_NUM; ++i)
         }
 
 for (size_t i = 0; i < DIR_NUM; ++i)