Fixed traff type descritpion.

[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..b2bc52d6f8f548abd16f7ab7924ac63b1222f722 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 "resetable_utils.h"
+
 #include "stg/tariff_conf.h"
 #include "stg/common.h"
 
@@ -32,13 +34,6 @@ using namespace STG;
 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)
 {
@@ -73,6 +68,13 @@ if (!data.tariffConf.traffType.empty())
         case TRAFF_MAX: stream << "<traffType value=\"max\"/>"; break;
         }
 
+if (!data.tariffConf.period.empty())
+    switch (data.tariffConf.period.data())
+        {
+        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)
     if (!data.dirPrice[i].hDay.empty() &&
         !data.dirPrice[i].mDay.empty() &&
@@ -89,6 +91,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, "threshold", data.dirPrice, &DIRPRICE_DATA_RES::threshold);
 
 return stream.str();
 }