Added resetable utils for attributes.

[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 c23cd0cd3ad690d9144f33f85d8c9f7f0d28cae1..8a1c56a414db3a444cb9596a0c046e1863561f5e 100644 (file)
--- a/stglibs/srvconf.lib/parsers/chg_tariff.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_tariff.cpp
@@ -20,6 +20,8 @@
 
 #include "chg_tariff.h"
 
 
 #include "chg_tariff.h"
 

+#include "resetable_utils.h"
+

 #include "stg/tariff_conf.h"
 #include "stg/common.h"
 
 #include "stg/tariff_conf.h"
 #include "stg/common.h"
 


@@ -32,13 +34,6 @@ using namespace STG;
 namespace
 {
 
 namespace
 {
 

-template <typename T>
-void appendResetable(std::ostream & stream, const std::string & name, const T & value)
-{
-if (!value.empty())
-    stream << "<" << name << " value=\"" << value.data() << "\"/>";
-}
-

 template <typename A, typename T>
 void appendSlashedResetable(std::ostream & stream, const std::string & name, const A & array, T A::value_type:: * field)
 {
 template <typename A, typename T>
 void appendSlashedResetable(std::ostream & stream, const std::string & name, const A & array, T A::value_type:: * field)
 {


@@ -56,7 +51,7 @@ 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;
 


@@ -65,12 +60,13 @@ appendResetable(stream, "passiveCost", data.tariffConf.passiveCost);
 appendResetable(stream, "free", data.tariffConf.free);
 
 if (!data.tariffConf.traffType.empty())
 appendResetable(stream, "free", data.tariffConf.free);
 
 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)


@@ -89,6 +85,7 @@ appendSlashedResetable(stream, "priceNightA", data.dirPrice, &DIRPRICE_DATA_RES:
 appendSlashedResetable(stream, "priceNightB", data.dirPrice, &DIRPRICE_DATA_RES::priceNightB);
 appendSlashedResetable(stream, "singlePrice", data.dirPrice, &DIRPRICE_DATA_RES::singlePrice);
 appendSlashedResetable(stream, "noDiscount", data.dirPrice, &DIRPRICE_DATA_RES::noDiscount);
 appendSlashedResetable(stream, "priceNightB", data.dirPrice, &DIRPRICE_DATA_RES::priceNightB);
 appendSlashedResetable(stream, "singlePrice", data.dirPrice, &DIRPRICE_DATA_RES::singlePrice);
 appendSlashedResetable(stream, "noDiscount", data.dirPrice, &DIRPRICE_DATA_RES::noDiscount);

+appendSlashedResetable(stream, "threshold", data.dirPrice, &DIRPRICE_DATA_RES::threshold);

 
 return stream.str();
 }
 
 return stream.str();
 }