Implemented XDG-compliant config file reading.

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / tariff_helper.cpp

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/tariff_helper.cpp b/projects/stargazer/plugins/configuration/rpcconfig/tariff_helper.cpp
index 91f60062cb48e3b08ef609b386b38f239d5e0d62..85abf8205a5e59822db40850c3b37d4de905be45 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/tariff_helper.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/tariff_helper.cpp
@@ -1,3 +1,5 @@
+#include <ostream> // xmlrpc-c devs have missed something :)
+

 #include "tariff_helper.h"
 
 void TARIFF_HELPER::GetTariffInfo(xmlrpc_c::value * info) const
 #include "tariff_helper.h"
 
 void TARIFF_HELPER::GetTariffInfo(xmlrpc_c::value * info) const


@@ -10,6 +12,7 @@ structVal["fee"] = xmlrpc_c::value_double(data.tariffConf.fee);
 structVal["freemb"] = xmlrpc_c::value_double(data.tariffConf.free);
 structVal["passivecost"] = xmlrpc_c::value_double(data.tariffConf.passiveCost);
 structVal["traffType"] = xmlrpc_c::value_int(data.tariffConf.traffType);
 structVal["freemb"] = xmlrpc_c::value_double(data.tariffConf.free);
 structVal["passivecost"] = xmlrpc_c::value_double(data.tariffConf.passiveCost);
 structVal["traffType"] = xmlrpc_c::value_int(data.tariffConf.traffType);

+structVal["period"] = xmlrpc_c::value_string(TARIFF::PeriodToString(data.tariffConf.period));

 
 std::vector<xmlrpc_c::value> prices(DIR_NUM);
 
 
 std::vector<xmlrpc_c::value> prices(DIR_NUM);
 


@@ -63,6 +66,11 @@ if ((it = structVal.find("traffType")) != structVal.end())
     data.tariffConf.traffType = xmlrpc_c::value_int(it->second);
     }
 
     data.tariffConf.traffType = xmlrpc_c::value_int(it->second);
     }
 

+if ((it = structVal.find("period")) != structVal.end())
+    {
+    data.tariffConf.period = TARIFF::StringToPeriod(xmlrpc_c::value_string(it->second));
+    }
+

 if ((it = structVal.find("dirprices")) != structVal.end())
     {
     std::vector<xmlrpc_c::value> prices(
 if ((it = structVal.find("dirprices")) != structVal.end())
     {
     std::vector<xmlrpc_c::value> prices(