Ticket 37. The object tariff definition moved into the if(newTariff)

[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 b971c638ad3b90304a6212ec55dd2a39fa5ef599..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,12 +28,12 @@ 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->Count());
+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->Count());
+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;
 
 
 std::vector<xmlrpc_c::value> dirnameVal;
 


@@ -75,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);