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 906277c3afcc3fed33e2860735ea08c2f3ef9d47..950669f2c5fd79c29c5731bf2392fe52df3b7675 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -20,190 +20,206 @@
 
 #include "stg/servconf.h"
 
 
 #include "stg/servconf.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/auth_by.h"
+#include "parsers/get_users.h"
+#include "parsers/get_user.h"
+#include "parsers/chg_user.h"
+
+#include "parsers/base.h"
+

 #include "stg/common.h"
 
 #include <cstdio>
 #include <cstring>
 
 #include "stg/common.h"
 
 #include <cstdio>
 #include <cstring>
 

-namespace
-{
+#include <expat.h>

 
 

-//-----------------------------------------------------------------------------
-void Start(void *data, const char *el, const char **attr)
-{
-SERVCONF * sc = static_cast<SERVCONF *>(data);
-sc->Start(el, attr);
-}
-//-----------------------------------------------------------------------------
-void End(void * data, const char * el)
+using namespace STG;
+
+class SERVCONF::IMPL

 {
 {

-SERVCONF * sc = static_cast<SERVCONF *>(data);
-sc->End(el);
-}
+public:
+    IMPL(const std::string & server, uint16_t port,
+         const std::string & login, const std::string & password);

 
 

-} // namespace anonymous
+    const std::string & GetStrError() const;
+    static void Start(void * data, const char * el, const char ** attr);
+    static void End(void * data, const char * el);

 
 

-int AnsRecv(void * data, std::list<std::string> * list1)
-{
-SERVCONF * sc = static_cast<SERVCONF *>(data);
+    template <class P, typename C>
+    int Exec(const std::string & request, C callback, void * data)
+    {
+        P cp(callback, data);
+        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);
+    }

 
 

-XML_ParserReset(sc->parser, NULL);
-XML_SetElementHandler(sc->parser, Start, End);
-XML_SetUserData(sc->parser, data);
+private:
+    NETTRANSACT nt;

 
 

-char ans[ENC_MSG_LEN + 1];
-int len, done = 0;
+    std::string errorMsg;
+    XML_Parser parser;

 
 

-//loop parsing
-std::list<std::string>::iterator node;
-node = list1->begin();
+    static bool AnsRecv(void * data, const std::string & chunk, bool final);
+    int ExecImpl(const std::string & request, PARSER & cp);
+};

 
 

-while (node != list1->end())
+bool SERVCONF::IMPL::AnsRecv(void * data, const std::string & chunk, bool final)
+{
+SERVCONF::IMPL * sc = static_cast<SERVCONF::IMPL *>(data);
+
+if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ERROR)

     {
     {

-    strncpy(ans, node->c_str(), ENC_MSG_LEN);
-    ans[ENC_MSG_LEN] = 0;
-    len = strlen(ans);
-
-    if (XML_Parse(sc->parser, ans, len, done) == XML_STATUS_ERROR)
-        {
-        strprintf(&sc->errorMsg, "XML parse error at line %d: %s",
-                  static_cast<int>(XML_GetCurrentLineNumber(sc->parser)),
-                  XML_ErrorString(XML_GetErrorCode(sc->parser)));
-        printf("%s\n", sc->errorMsg.c_str());
-        return st_xml_parse_error;
-        }
-    ++node;
+    strprintf(&sc->errorMsg, "XML parse error at line %d: %s",
+              static_cast<int>(XML_GetCurrentLineNumber(sc->parser)),
+              XML_ErrorString(XML_GetErrorCode(sc->parser)));
+    printf("%s\n", sc->errorMsg.c_str());
+    return false;

     }
 
     }
 

-return st_ok;
+return true;

 }
 
 }
 

-//-----------------------------------------------------------------------------

 SERVCONF::SERVCONF(const std::string & server, uint16_t port,
                    const std::string & login, const std::string & password)
 SERVCONF::SERVCONF(const std::string & server, uint16_t port,
                    const std::string & login, const std::string & password)

-    : currParser(NULL),
-      nt( server, port, login, password )
+    : pImpl(new IMPL(server, port, login, password))

 {
 {

-parser = XML_ParserCreate(NULL);
-nt.SetRxCallback(this, AnsRecv);

 }
 }

-//-----------------------------------------------------------------------------
-int SERVCONF::GetUser(const char * l)
-{
-char request[255];
-snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
-
-currParser = &parserGetUser;

 
 

-return Exec(request);
+SERVCONF::~SERVCONF()
+{
+delete pImpl;

 }
 }

-//-----------------------------------------------------------------------------
-int SERVCONF::AuthBy(const char * l)
+
+int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data)

 {
 {

-char request[255];
-snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);
+return pImpl->Exec<SERVER_INFO::PARSER>("<GetServerInfo/>", f, data);
+}

 
 

-currParser = &parserAuthBy;
+// -- Admins --

 
 

-return Exec(request);
+int SERVCONF::GetAdmins(GET_ADMINS::CALLBACK f, void * data)
+{
+return pImpl->Exec<GET_ADMINS::PARSER>("<GetAdmins/>", f, data);

 }
 }

-//-----------------------------------------------------------------------------
-int SERVCONF::GetUsers()
+
+int SERVCONF::GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data)

 {
 {

-char request[] = "<GetUsers/>";
+return pImpl->Exec<GET_ADMIN::PARSER>("<GetAdmin login=\"" + login + "\"/>", f, data);
+}

 
 

-currParser = &parserGetUsers;
+int SERVCONF::ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data)
+{
+return pImpl->Exec<SIMPLE::PARSER>("ChgAdmin", "<ChgAdmin" + CHG_ADMIN::Serialize(conf) + "/>", f, data);
+}

 
 

-return Exec(request);
+int SERVCONF::AddAdmin(const std::string & login, const ADMIN_CONF & conf, SIMPLE::CALLBACK f, void * data)
+{
+int res = pImpl->Exec<SIMPLE::PARSER>("AddAdmin", "<AddAdmin login=\"" + login + "\"/>", f, data);
+if (res != st_ok)
+    return res;
+return pImpl->Exec<SIMPLE::PARSER>("ChgAdmin", "<ChgAdmin" + CHG_ADMIN::Serialize(conf) + "/>", f, data);

 }
 }

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

 {
 {

-char request[] = "<GetServerInfo/>";
+return pImpl->Exec<SIMPLE::PARSER>("DelAdmin", "<DelAdmin login=\"" + login + "\"/>", f, data);
+}

 
 

-currParser = &parserServerInfo;
+// -- Users --

 
 

-return Exec(request);
-}
-//-----------------------------------------------------------------------------
-int SERVCONF::ChgUser(const char * request)
+int SERVCONF::GetUsers(GET_USERS::CALLBACK f, void * data)

 {
 {

-currParser = &parserChgUser;
-
-return Exec(request);
+return pImpl->Exec<GET_USERS::PARSER>("<GetUsers/>", f, data);

 }
 }

-//-----------------------------------------------------------------------------
-int SERVCONF::SendMessage(const char * request)
-{
-currParser = &parserSendMessage;

 
 

-return Exec(request);
-}
-//-----------------------------------------------------------------------------
-int SERVCONF::CheckUser(const char * login, const char * password)
+int SERVCONF::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data)

 {
 {

-char request[255];
-snprintf(request, 255, "<CheckUser login=\"%s\" password=\"%s\"/>", login, password);
-
-currParser = &parserCheckUser;
+return pImpl->Exec<GET_USER::PARSER>("<GetUser login=\"" + login + "\"/>", f, data);
+}

 
 

-return Exec(request);
+int SERVCONF::ChgUser(const std::string & request, SIMPLE::CALLBACK f, void * data)
+{
+return pImpl->Exec<CHG_USER::PARSER>(request, f, data);

 }
 }

-//-----------------------------------------------------------------------------
-int SERVCONF::Start(const char * el, const char ** attr)
+
+int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data)

 {
 {

-currParser->ParseStart(el, attr);
-return 0;
+return pImpl->Exec<SIMPLE::PARSER>("DelUser", "<DelUser login=\"" + login + "\"/>", f, data);

 }
 }

-//-----------------------------------------------------------------------------
-void SERVCONF::End(const char * el)
+
+int SERVCONF::AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data)

 {
 {

-currParser->ParseEnd(el);
+return pImpl->Exec<SIMPLE::PARSER>("AddUser", "<AddUser><Login value=\"" + login + "\"/></AddUser>", f, data);

 }
 }

-//-----------------------------------------------------------------------------
-void SERVCONF::SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data)
+
+int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)

 {
 {

-parserGetUsers.SetCallback(f, data);
+return pImpl->Exec<AUTH_BY::PARSER>("<GetUserAuthBy login=\"" + login + "\"/>", f, data);

 }
 }

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

 {
 {

-parserGetUser.SetCallback(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);

 }
 }

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

 {
 {

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

 }
 }

-//-----------------------------------------------------------------------------
-void SERVCONF::SetServerInfoCallback(PARSER_SERVER_INFO::CALLBACK f, void * data)
+
+const std::string & SERVCONF::GetStrError() const

 {
 {

-parserServerInfo.SetCallback(f, data);
+return pImpl->GetStrError();

 }
 }

+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-void SERVCONF::SetChgUserCallback(PARSER_CHG_USER::CALLBACK f, void * data)
+SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port,
+                     const std::string & login, const std::string & password)
+    : nt( server, port, login, password )

 {
 {

-parserChgUser.SetCallback(f, data);
+parser = XML_ParserCreate(NULL);
+nt.SetRxCallback(this, AnsRecv);

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void SERVCONF::SetCheckUserCallback(PARSER_CHECK_USER::CALLBACK f, void * data)
+void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr)

 {
 {

-parserCheckUser.SetCallback(f, data);
+PARSER * currParser = static_cast<PARSER *>(data);
+currParser->ParseStart(el, attr);

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void SERVCONF::SetSendMessageCallback(PARSER_SEND_MESSAGE::CALLBACK f, void * data)
+void SERVCONF::IMPL::End(void * data, const char * el)

 {
 {

-parserSendMessage.SetCallback(f, data);
+PARSER * currParser = static_cast<PARSER *>(data);
+currParser->ParseEnd(el);

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-const std::string & SERVCONF::GetStrError() const
+const std::string & SERVCONF::IMPL::GetStrError() const

 {
 return errorMsg;
 }
 //-----------------------------------------------------------------------------
 {
 return errorMsg;
 }
 //-----------------------------------------------------------------------------

-int SERVCONF::Exec(const char * request)
+int SERVCONF::IMPL::ExecImpl(const std::string & request, PARSER & cp)

 {
 {

-nt.Reset();
+XML_ParserReset(parser, NULL);
+XML_SetElementHandler(parser, Start, End);
+XML_SetUserData(parser, &cp);

 
 int ret = 0;
 if ((ret = nt.Connect()) != st_ok)
 
 int ret = 0;
 if ((ret = nt.Connect()) != st_ok)


@@ -211,7 +227,7 @@ if ((ret = nt.Connect()) != st_ok)
     errorMsg = nt.GetError();
     return ret;
     }
     errorMsg = nt.GetError();
     return ret;
     }

-if ((ret = nt.Transact(request)) != st_ok)
+if ((ret = nt.Transact(request.c_str())) != st_ok)

     {
     errorMsg = nt.GetError();
     return ret;
     {
     errorMsg = nt.GetError();
     return ret;