TEST_SETTINGS_LOCAL moved outside the namespace, more assertions added

[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 fdb56048f5b112d4626dd1a473213dd2aff9661f..91f910e02e21a21145c4ef1bb48c482d6c75da44 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
@@ -1,7 +1,8 @@
-#include "info_methods.h"
-
 #include <sys/utsname.h>
-#include "version.h"
+
+#include "stg/version.h"
+#include "stg/common.h"
+#include "info_methods.h"
 #include "rpcconfig.h"
 
 void METHOD_INFO::execute(xmlrpc_c::paramList const & paramList,
@@ -30,15 +31,13 @@ structVal["tariff"] = xmlrpc_c::value_int(2);
 structVal["users_num"] = xmlrpc_c::value_int(users->GetUserNum());
 structVal["uname"] = xmlrpc_c::value_string(un);
 structVal["dir_num"] = xmlrpc_c::value_int(DIR_NUM);
-structVal["day_fee"] = xmlrpc_c::value_int(settings->GetDayFee());
+structVal["day_fee"] = xmlrpc_c::value_int(dayFee);
 
 std::vector<xmlrpc_c::value> dirnameVal;
 
 for (int i = 0; i< DIR_NUM; i++)
     {
-    string dn2e;
-    Encode12str(dn2e, settings->GetDirName(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);