Add some assertions

[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..b971c638ad3b90304a6212ec55dd2a39fa5ef599 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
@@ -26,9 +26,9 @@ un += " ";
 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(tariffs->Count());
 structVal["tariff"] = xmlrpc_c::value_int(2);
-structVal["users_num"] = xmlrpc_c::value_int(users->GetUserNum());
+structVal["users_num"] = xmlrpc_c::value_int(users->Count());
 structVal["uname"] = xmlrpc_c::value_string(un);
 structVal["dir_num"] = xmlrpc_c::value_int(DIR_NUM);
 structVal["day_fee"] = xmlrpc_c::value_int(dayFee);
@@ -37,9 +37,7 @@ 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);