[NY] Implemented SERVCONF using PIMPL.

[stg.git] / stglibs / srvconf.lib / include / stg / servconf.h

diff --git a/stglibs/srvconf.lib/include/stg/servconf.h b/stglibs/srvconf.lib/include/stg/servconf.h
index 094524e9af21a74eaf2b582207ec0983d3e085ea..32ee1cd4b9e6eb00e613f9eb2dfc38943cfb895f 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/servconf.h
+++ b/stglibs/srvconf.lib/include/stg/servconf.h
@@ -27,8 +27,6 @@
 #ifndef SERVCONF_H
 #define SERVCONF_H
 
 #ifndef SERVCONF_H
 #define SERVCONF_H
 

-#include "netunit.h"
-

 #include "stg/parser_auth_by.h"
 #include "stg/parser_server_info.h"
 #include "stg/parser_check_user.h"
 #include "stg/parser_auth_by.h"
 #include "stg/parser_server_info.h"
 #include "stg/parser_check_user.h"


@@ -38,27 +36,15 @@
 #include "stg/parser_send_message.h"
 
 #include "stg/os_int.h"
 #include "stg/parser_send_message.h"
 
 #include "stg/os_int.h"

-#include "stg/const.h"

 
 

-#include <list>
-#include <vector>

 #include <string>
 
 #include <string>
 

-#include <expat.h>
-
-#define MAX_ERR_STR_LEN (64)
-#define IP_STRING_LEN   (255)
-
-struct ADMINDATA
-{
-    char login[ADM_LOGIN_LEN];
-};
-//-----------------------------------------------------------------------------

 class SERVCONF
 {
 public:
     SERVCONF(const std::string & server, uint16_t port,
              const std::string & login, const std::string & password);
 class SERVCONF
 {
 public:
     SERVCONF(const std::string & server, uint16_t port,
              const std::string & login, const std::string & password);

+    ~SERVCONF();

 
     int GetUsers(PARSER_GET_USERS::CALLBACK f, void * data);
     int GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data);
 
     int GetUsers(PARSER_GET_USERS::CALLBACK f, void * data);
     int GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data);


@@ -69,28 +55,10 @@ public:
     int CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data);
 
     const std::string & GetStrError() const;
     int CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data);
 
     const std::string & GetStrError() const;

-    void Start(const char * el, const char ** attr);
-    void End(const char * el);

 
 private:
 
 private:

-    PARSER * currParser;
-
-    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;
-
-    NETTRANSACT nt;
-
-    std::string errorMsg;
-    XML_Parser parser;
-
-    int Exec(const std::string & request, PARSER & cp);
-
-    friend bool AnsRecv(void * data, const std::string & chunk, bool final);
+    class IMPL;
+    IMPL * pImpl;

 };
 //-----------------------------------------------------------------------------
 
 };
 //-----------------------------------------------------------------------------