Ticket 37. The stgTime argument added in TariffChangeIsAllowed()

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

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
index e4a75a87ddca7acc1022b96a23e82add6a67bbda..7d3afacaecaf1134682bb99c2bc3839f350d6bea 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
@@ -1,5 +1,7 @@
 #include <sys/utsname.h>
 
 #include <sys/utsname.h>
 

+#include <ostream> // xmlrpc-c devs have missed something :)
+

 #include "stg/version.h"
 #include "stg/common.h"
 #include "info_methods.h"
 #include "stg/version.h"
 #include "stg/common.h"
 #include "info_methods.h"


@@ -26,20 +28,18 @@ un += " ";
 un += utsn.nodename;
 
 structVal["version"] = xmlrpc_c::value_string(SERVER_VERSION);
 un += utsn.nodename;
 
 structVal["version"] = xmlrpc_c::value_string(SERVER_VERSION);

-structVal["tariff_num"] = xmlrpc_c::value_int(tariffs->GetTariffsNum());
+structVal["tariff_num"] = xmlrpc_c::value_int(static_cast<int>(tariffs->Count()));

 structVal["tariff"] = xmlrpc_c::value_int(2);
 structVal["tariff"] = xmlrpc_c::value_int(2);

-structVal["users_num"] = xmlrpc_c::value_int(users->GetUserNum());
+structVal["users_num"] = xmlrpc_c::value_int(static_cast<int>(users->Count()));

 structVal["uname"] = xmlrpc_c::value_string(un);
 structVal["dir_num"] = xmlrpc_c::value_int(DIR_NUM);
 structVal["uname"] = xmlrpc_c::value_string(un);
 structVal["dir_num"] = xmlrpc_c::value_int(DIR_NUM);

-structVal["day_fee"] = xmlrpc_c::value_int(dayFee);
+structVal["day_fee"] = xmlrpc_c::value_int(static_cast<int>(dayFee));

 
 std::vector<xmlrpc_c::value> dirnameVal;
 
 for (int i = 0; i< DIR_NUM; i++)
     {
 
 std::vector<xmlrpc_c::value> dirnameVal;
 
 for (int i = 0; i< DIR_NUM; i++)
     {

-    std::string dn2e;
-    Encode12str(dn2e, dirNames[i]);
-    dirnameVal.push_back(xmlrpc_c::value_string(dn2e));
+    dirnameVal.push_back(xmlrpc_c::value_string(IconvString(dirNames[i], "KOI8-RU", "UTF-8")));

     }
 
 structVal["dir_names"] = xmlrpc_c::value_array(dirnameVal);
     }
 
 structVal["dir_names"] = xmlrpc_c::value_array(dirnameVal);


@@ -77,8 +77,6 @@ void METHOD_LOGOUT::execute(xmlrpc_c::paramList const & paramList,
 std::string cookie = paramList.getString(0);
 paramList.verifyEnd(1);
 
 std::string cookie = paramList.getString(0);
 paramList.verifyEnd(1);
 

-std::map<std::string, xmlrpc_c::value> structVal;
-

 if (config->LogoutAdmin(cookie))
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
 if (config->LogoutAdmin(cookie))
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);