Stargazer (#6)

[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 7614205346e72e83d128bea9068d89b58a96366c..2047202a7cec5345636959bc3fb10c10e1c4ce8b 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
@@ -1,7 +1,12 @@
+#include <ostream> // xmlrpc-c devs have missed something :)
+

 #include "tariffs_methods.h"
 #include "rpcconfig.h"
 #include "tariff_helper.h"
 #include "tariffs_methods.h"
 #include "rpcconfig.h"
 #include "tariff_helper.h"

+

 #include "stg/tariffs.h"
 #include "stg/tariffs.h"

+#include "stg/tariff.h"
+#include "stg/tariff_conf.h"

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


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

-const TARIFF * tariff = tariffs->FindByName(name);
+const auto tariff = tariffs->FindByName(name);

 
 if (!tariff)
     {
 
 if (!tariff)
     {


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

-TARIFF_DATA td(tariff->GetTariffData());
+auto td = tariff->GetTariffData();

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


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

-ADMIN * admin;
+STG::Admin * admin;

 
 

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

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     }
 
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     }
 

-const TARIFF * tariff = tariffs->FindByName(name);
+const auto tariff = tariffs->FindByName(name);

 
 if (!tariff)
     {
 
 if (!tariff)
     {


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

-TARIFF_DATA td(tariff->GetTariffData());
+auto td = tariff->GetTariffData();

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


@@ -105,13 +110,13 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 std::vector<xmlrpc_c::value> tariffsInfo;
 
 
 std::vector<xmlrpc_c::value> tariffsInfo;
 
 

-std::list<TARIFF_DATA> dataList;
+std::vector<STG::TariffData> dataList;

 tariffs->GetTariffsData(&dataList);
 tariffs->GetTariffsData(&dataList);

-std::list<TARIFF_DATA>::const_iterator it = dataList.begin();
+auto it = dataList.begin();

 for (; it != dataList.end(); ++it)
     {
     xmlrpc_c::value info;
 for (; it != dataList.end(); ++it)
     {
     xmlrpc_c::value info;

-    TARIFF_DATA td(*it); // 'cause TARIFF_HELPER work in both ways and take not const referense
+    auto td = *it; // 'cause TARIFF_HELPER work in both ways and take not const referense

     TARIFF_HELPER helper(td);
     helper.GetTariffInfo(&info);
     tariffsInfo.push_back(info);
     TARIFF_HELPER helper(td);
     helper.GetTariffInfo(&info);
     tariffsInfo.push_back(info);


@@ -125,7 +130,6 @@ void METHOD_TARIFF_ADD::execute(xmlrpc_c::paramList const & paramList,
 {
 std::string cookie = paramList.getString(0);
 std::string tariff = paramList.getString(1);
 {
 std::string cookie = paramList.getString(0);
 std::string tariff = paramList.getString(1);

-std::string enc;

 paramList.verifyEnd(2);
 
 ADMIN_INFO adminInfo;
 paramList.verifyEnd(2);
 
 ADMIN_INFO adminInfo;


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

-ADMIN * admin;
+STG::Admin * admin;

 
 

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

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


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

-ADMIN * admin;
+STG::Admin * admin;

 
 

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

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;