Fixed compilation issue.

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

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 45d60f666c9e520d0a135544ce1372de975e969a..330ba8b13f0e2004e244e68997398ade02593eff 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -20,8 +20,15 @@
 
 #include "stg/servconf.h"
 
-#include "stg/netunit.h"
-#include "stg/servconf_types.h"
+#include "netunit.h"
+#include "parsers/auth_by.h"
+#include "parsers/server_info.h"
+#include "parsers/check_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 "stg/common.h"
 
@@ -30,59 +37,30 @@
 
 #include <expat.h>
 
+using namespace STG;
+
 class SERVCONF::IMPL
 {
 public:
     IMPL(const std::string & server, uint16_t port,
          const std::string & login, const std::string & password);
 
-    int GetUsers(PARSER_GET_USERS::CALLBACK f, void * data);
-    int GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data);
-    int ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data);
-    int AuthBy(const std::string & login, PARSER_AUTH_BY::CALLBACK f, void * data);
-    int SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data);
-    int ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data);
-    int CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data);
-
     const std::string & GetStrError() const;
     static void Start(void * data, const char * el, const char ** attr);
     static void End(void * data, const char * el);
 
-private:
-    PARSER_GET_USERS parserGetUsers;
-    PARSER_GET_USER parserGetUser;
-    PARSER_AUTH_BY parserAuthBy;
-    PARSER_SERVER_INFO  parserServerInfo;
-    PARSER_CHG_USER parserChgUser;
-    PARSER_CHECK_USER parserCheckUser;
-    PARSER_SEND_MESSAGE parserSendMessage;
+    template <class P, typename C>
+    int Exec(const std::string & request, C callback, void * data);
 
+private:
     NETTRANSACT nt;
 
     std::string errorMsg;
     XML_Parser parser;
 
-    int Exec(const std::string & request, PARSER & cp);
-
     static bool AnsRecv(void * data, const std::string & chunk, bool final);
 };
 
-/*namespace
-{
-
-void ElementStart(void * data, const char * el, const char ** attr)
-{
-static_cast<SERVCONF::IMPL *>(data)->Start(el, attr);
-}
-
-void ElementEnd(void * data, const char * el)
-{
-static_cast<SERVCONF::IMPL *>(data)->End(el);
-}
-
-} // namespace anonymous
-*/
-
 bool SERVCONF::IMPL::AnsRecv(void * data, const std::string & chunk, bool final)
 {
 SERVCONF::IMPL * sc = static_cast<SERVCONF::IMPL *>(data);
@@ -107,42 +85,42 @@ SERVCONF::SERVCONF(const std::string & server, uint16_t port,
 
 SERVCONF::~SERVCONF()
 {
-    delete pImpl;
+delete pImpl;
 }
 
-int SERVCONF::GetUsers(PARSER_GET_USERS::CALLBACK f, void * data)
+int SERVCONF::GetUsers(GET_USERS::CALLBACK f, void * data)
 {
-    return pImpl->GetUsers( f, data );
+return pImpl->Exec<GET_USERS::PARSER>("<GetUsers/>", f, data);
 }
 
-int SERVCONF::GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data)
+int SERVCONF::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data)
 {
-    return pImpl->GetUser(login, f, data);
+return pImpl->Exec<GET_USER::PARSER>("<GetUser login=\"" + login + "\"/>", f, data);
 }
 
-int SERVCONF::ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data)
+int SERVCONF::ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data)
 {
-    return pImpl->ChgUser(request, f, data);
+return pImpl->Exec<CHG_USER::PARSER>(request, f, data);
 }
 
-int SERVCONF::AuthBy(const std::string & login, PARSER_AUTH_BY::CALLBACK f, void * data)
+int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)
 {
-    return pImpl->AuthBy(login, f, data);
+return pImpl->Exec<AUTH_BY::PARSER>("<GetUserAuthBy login=\"" + login + "\"/>", f, data);
 }
 
-int SERVCONF::SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data)
+int SERVCONF::SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data)
 {
-    return pImpl->SendMessage(request, f, data);
+return pImpl->Exec<SEND_MESSAGE::PARSER>(request, f, data);
 }
 
-int SERVCONF::ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data)
+int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data)
 {
-    return pImpl->ServerInfo(f, data);
+return pImpl->Exec<SERVER_INFO::PARSER>("<GetServerInfo/>", f, data);
 }
 
-int SERVCONF::CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data)
+int SERVCONF::CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data)
 {
-    return pImpl->CheckUser(login, password, f, data);
+return pImpl->Exec<CHECK_USER::PARSER>("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", f, data);
 }
 
 const std::string & SERVCONF::GetStrError() const
@@ -159,48 +137,6 @@ parser = XML_ParserCreate(NULL);
 nt.SetRxCallback(this, AnsRecv);
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data)
-{
-parserGetUser.SetCallback(f, data);
-return Exec("<GetUser login=\"" + login + "\"/>", parserGetUser);
-}
-//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::AuthBy(const std::string & login, PARSER_AUTH_BY::CALLBACK f, void * data)
-{
-parserAuthBy.SetCallback(f, data);
-return Exec("<GetUserAuthBy login=\"" + login + "\"/>", parserAuthBy);
-}
-//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::GetUsers(PARSER_GET_USERS::CALLBACK f, void * data)
-{
-parserGetUsers.SetCallback(f, data);
-return Exec("<GetUsers/>", parserGetUsers);
-}
-//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data)
-{
-parserServerInfo.SetCallback(f, data);
-return Exec("<GetServerInfo/>", parserServerInfo);
-}
-//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data)
-{
-parserChgUser.SetCallback(f, data);
-return Exec(request, parserChgUser);
-}
-//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data)
-{
-parserSendMessage.SetCallback(f, data);
-return Exec(request, parserSendMessage);
-}
-//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data)
-{
-parserCheckUser.SetCallback(f, data);
-return Exec("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", parserCheckUser);
-}
-//-----------------------------------------------------------------------------
 void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr)
 {
 PARSER * currParser = static_cast<PARSER *>(data);
@@ -218,8 +154,10 @@ const std::string & SERVCONF::IMPL::GetStrError() const
 return errorMsg;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::Exec(const std::string & request, PARSER & cp)
+template <class P, typename C>
+int SERVCONF::IMPL::Exec(const std::string & request, C callback, void * data)
 {
+P cp(callback, data);
 XML_ParserReset(parser, NULL);
 XML_SetElementHandler(parser, Start, End);
 XML_SetUserData(parser, &cp);