Timeouts checking added partially

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

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
index 36194e3682f4c43c6b1f522cb81f63537c53d0a8..7614205346e72e83d128bea9068d89b58a96366c 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
@@ -1,6 +1,10 @@
-#include "rpcconfig.h"

 #include "tariffs_methods.h"
 #include "tariffs_methods.h"

+#include "rpcconfig.h"

 #include "tariff_helper.h"
 #include "tariff_helper.h"

+#include "stg/tariffs.h"
+#include "stg/users.h"
+#include "stg/admins.h"
+#include "stg/admin.h"

 
 void METHOD_TARIFF_GET::execute(xmlrpc_c::paramList const & paramList,
                                 xmlrpc_c::value *   const   retvalPtr)
 
 void METHOD_TARIFF_GET::execute(xmlrpc_c::paramList const & paramList,
                                 xmlrpc_c::value *   const   retvalPtr)


@@ -28,9 +32,7 @@ if (!tariff)
     return;
     }
 
     return;
     }
 

-TARIFF_DATA td;
-
-tariff->GetTariffData(&td);
+TARIFF_DATA td(tariff->GetTariffData());

 
 TARIFF_HELPER helper(td);
 
 
 TARIFF_HELPER helper(td);
 


@@ -53,7 +55,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-ADMIN admin;
+ADMIN * admin;

 
 if (admins->FindAdmin(adminInfo.admin, &admin))
     {
 
 if (admins->FindAdmin(adminInfo.admin, &admin))
     {


@@ -69,9 +71,7 @@ if (!tariff)
     return;
     }
 
     return;
     }
 

-TARIFF_DATA td;
-
-tariff->GetTariffData(&td);
+TARIFF_DATA td(tariff->GetTariffData());

 
 TARIFF_HELPER helper(td);
 
 
 TARIFF_HELPER helper(td);
 


@@ -136,7 +136,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-ADMIN admin;
+ADMIN * admin;

 
 if (admins->FindAdmin(adminInfo.admin, &admin))
     {
 
 if (admins->FindAdmin(adminInfo.admin, &admin))
     {


@@ -168,7 +168,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-ADMIN admin;
+ADMIN * admin;

 
 if (admins->FindAdmin(adminInfo.admin, &admin))
     {
 
 if (admins->FindAdmin(adminInfo.admin, &admin))
     {