[NY Flight] Improved XML parsing.

[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 c62161be2853a70834f4ab9f735cf6a67282ee19..7cc18c4a7fd16c78bfef5c71f6891b0fa0295cd6 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/servconf.h
+++ b/stglibs/srvconf.lib/include/stg/servconf.h
@@ -35,6 +35,7 @@
 #include "stg/parser_get_user.h"
 #include "stg/parser_get_users.h"
 #include "stg/parser_chg_user.h"
+#include "stg/parser_send_message.h"
 
 #include "stg/os_int.h"
 #include "stg/const.h"
@@ -45,42 +46,19 @@
 
 #include <expat.h>
 
-void Start(void * data, const char * el, const char ** attr);
-void End(void * data, const char * el);
-
 #define MAX_ERR_STR_LEN (64)
 #define IP_STRING_LEN   (255)
-//-----------------------------------------------------------------------------
-typedef int (* RecvSendMessageCb_t)(const char * answer, void * data);
-//-----------------------------------------------------------------------------
+
 struct ADMINDATA
 {
     char login[ADM_LOGIN_LEN];
 };
 //-----------------------------------------------------------------------------
-class PARSER_SEND_MESSAGE: public PARSER
-{
-public:
-    PARSER_SEND_MESSAGE();
-    int  ParseStart(const char * el, const char ** attr);
-    void ParseEnd(const char * el);
-    void ParseAnswer(const char * el, const char ** attr);
-    void SetSendMessageRecvCb(RecvSendMessageCb_t, void * data);
-private:
-    RecvSendMessageCb_t RecvSendMessageCb;
-    void * sendMessageCbData;
-    int depth;
-};
-//-----------------------------------------------------------------------------
 class SERVCONF
 {
 public:
-    SERVCONF();
-    void SetServer(const char * server);
-    void SetPort(uint16_t port);
-
-    void SetAdmLogin(const char * login);
-    void SetAdmPassword(const char * password);
+    SERVCONF(const std::string & server, uint16_t port,
+             const std::string & login, const std::string & password);
 
     void SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data);
     void SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data);
@@ -88,15 +66,13 @@ public:
     void SetChgUserCallback(PARSER_CHG_USER::CALLBACK f, void * data);
     void SetCheckUserCallback(PARSER_CHECK_USER::CALLBACK f, void * data);
     void SetGetUserCallback(PARSER_GET_USER::CALLBACK f, void * data);
-    void SetSendMessageCb(RecvSendMessageCb_t, void * data);
+    void SetSendMessageCallback(PARSER_SEND_MESSAGE::CALLBACK f, void * data);
 
     int GetUsers();
     int GetUser(const char * login);
     int ChgUser(const char * request);
     int AuthBy(const char * login);
-    // TODO: Remove this shit!
-    int MsgUser(const char * request);
-    int SendMessage(const char * login, const char * message, int prio);
+    int SendMessage(const char * request);
     int ServerInfo();
     int CheckUser(const char * login, const char * password);
 
@@ -120,13 +96,9 @@ private:
     std::string errorMsg;
     XML_Parser parser;
 
-    RecvSendMessageCb_t RecvSendMessageCb;
-
-    void * sendMessageDataCb;
-
     int Exec(const char * request);
 
-    friend int AnsRecv(void * data, std::list<std::string> * list);
+    friend bool AnsRecv(void * data, const std::string & chunk, bool final);
 };
 //-----------------------------------------------------------------------------