USER_STAT refactoring.

[stg.git] / stglibs / srvconf.lib / servconf.cpp

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 85d19d484def3e7ed5da96b9b1d27d651e0a707e..950669f2c5fd79c29c5731bf2392fe52df3b7675 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -22,20 +22,18 @@
 
 #include "netunit.h"
 
 
 #include "netunit.h"
 

+#include "parsers/simple.h"
+

 #include "parsers/server_info.h"
 
 #include "parsers/get_admins.h"
 #include "parsers/get_admin.h"
 #include "parsers/chg_admin.h"
 #include "parsers/server_info.h"
 
 #include "parsers/get_admins.h"
 #include "parsers/get_admin.h"
 #include "parsers/chg_admin.h"

-#include "parsers/add_admin.h"
-#include "parsers/del_admin.h"

 
 #include "parsers/auth_by.h"
 
 #include "parsers/auth_by.h"

-#include "parsers/check_user.h"

 #include "parsers/get_users.h"
 #include "parsers/get_user.h"
 #include "parsers/chg_user.h"
 #include "parsers/get_users.h"
 #include "parsers/get_user.h"
 #include "parsers/chg_user.h"

-#include "parsers/send_message.h"

 
 #include "parsers/base.h"
 
 
 #include "parsers/base.h"
 


@@ -65,6 +63,13 @@ public:
         return ExecImpl(request, cp);
     }
 
         return ExecImpl(request, cp);
     }
 

+    template <class P, typename C>
+    int Exec(const std::string & tag, const std::string & request, C callback, void * data)
+    {
+        P cp(tag, callback, data);
+        return ExecImpl(request, cp);
+    }
+

 private:
     NETTRANSACT nt;
 
 private:
     NETTRANSACT nt;
 


@@ -119,22 +124,22 @@ int SERVCONF::GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void *
 return pImpl->Exec<GET_ADMIN::PARSER>("<GetAdmin login=\"" + login + "\"/>", f, data);
 }
 
 return pImpl->Exec<GET_ADMIN::PARSER>("<GetAdmin login=\"" + login + "\"/>", f, data);
 }
 

-int SERVCONF::ChgAdmin(const std::string & login, const ADMIN_CONF_RES & conf, CHG_ADMIN::CALLBACK f, void * data)
+int SERVCONF::ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data)

 {
 {

-return pImpl->Exec<CHG_ADMIN::PARSER>("<ChgAdmin login=\"" + login + "\">" + CHG_ADMIN::Serialize(conf) + "</ChgAdmin>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("ChgAdmin", "<ChgAdmin" + CHG_ADMIN::Serialize(conf) + "/>", f, data);

 }
 
 }
 

-int SERVCONF::AddAdmin(const std::string & login, const ADMIN_CONF & conf, ADD_ADMIN::CALLBACK f, void * data)
+int SERVCONF::AddAdmin(const std::string & login, const ADMIN_CONF & conf, SIMPLE::CALLBACK f, void * data)

 {
 {

-int res = pImpl->Exec<ADD_ADMIN::PARSER>("<AddAdmin login=\"" + login + "\"/>", f, data);
+int res = pImpl->Exec<SIMPLE::PARSER>("AddAdmin", "<AddAdmin login=\"" + login + "\"/>", f, data);

 if (res != st_ok)
     return res;
 if (res != st_ok)
     return res;

-return pImpl->Exec<CHG_ADMIN::PARSER>("<ChgAdmin login=\"" + login + "\">" + CHG_ADMIN::Serialize(conf) + "</ChgAdmin>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("ChgAdmin", "<ChgAdmin" + CHG_ADMIN::Serialize(conf) + "/>", f, data);

 }
 
 }
 

-int SERVCONF::DelAdmin(const std::string & login, DEL_ADMIN::CALLBACK f, void * data)
+int SERVCONF::DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data)

 {
 {

-return pImpl->Exec<DEL_ADMIN::PARSER>("<DelAdmin login=\"" + login + "\"/>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("DelAdmin", "<DelAdmin login=\"" + login + "\"/>", f, data);

 }
 
 // -- Users --
 }
 
 // -- Users --


@@ -149,24 +154,34 @@ int SERVCONF::GetUser(const std::string & login, GET_USER::CALLBACK f, void * da
 return pImpl->Exec<GET_USER::PARSER>("<GetUser login=\"" + login + "\"/>", f, data);
 }
 
 return pImpl->Exec<GET_USER::PARSER>("<GetUser login=\"" + login + "\"/>", f, data);
 }
 

-int SERVCONF::ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data)
+int SERVCONF::ChgUser(const std::string & request, SIMPLE::CALLBACK f, void * data)

 {
 return pImpl->Exec<CHG_USER::PARSER>(request, f, data);
 }
 
 {
 return pImpl->Exec<CHG_USER::PARSER>(request, f, data);
 }
 

+int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data)
+{
+return pImpl->Exec<SIMPLE::PARSER>("DelUser", "<DelUser login=\"" + login + "\"/>", f, data);
+}
+
+int SERVCONF::AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data)
+{
+return pImpl->Exec<SIMPLE::PARSER>("AddUser", "<AddUser><Login value=\"" + login + "\"/></AddUser>", f, data);
+}
+

 int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)
 {
 return pImpl->Exec<AUTH_BY::PARSER>("<GetUserAuthBy login=\"" + login + "\"/>", f, data);
 }
 
 int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)
 {
 return pImpl->Exec<AUTH_BY::PARSER>("<GetUserAuthBy login=\"" + login + "\"/>", f, data);
 }
 

-int SERVCONF::SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data)
+int SERVCONF::SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data)

 {
 {

-return pImpl->Exec<SEND_MESSAGE::PARSER>(request, f, data);
+return pImpl->Exec<SIMPLE::PARSER>("SendMessage", "<Message login=\"" + login + "\" msgver=\"1\" msgtype=\"1\" repeat=\"0\" repeatperiod=\"0\" showtime=\"0\" text=\"" + Encode12str(text) + "\"/>", f, data);

 }
 
 }
 

-int SERVCONF::CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data)
+int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data)

 {
 {

-return pImpl->Exec<CHECK_USER::PARSER>("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("CheckUser", "<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", f, data);

 }
 
 const std::string & SERVCONF::GetStrError() const
 }
 
 const std::string & SERVCONF::GetStrError() const