[NY Flight] Improved XML parsing.

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

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index b8507098e2790425cfdfc7470c458d6a1facebd6..06a31a81801e4f3733b694594f96d534c1e58ae3 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -18,12 +18,6 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
- /*
- $Revision: 1.8 $
- $Date: 2010/08/04 00:40:38 $
- $Author: faust $
- */
-
 #include "stg/servconf.h"
 
 #include "stg/common.h"
@@ -31,88 +25,51 @@
 #include <cstdio>
 #include <cstring>
 
-using namespace std;
+namespace
+{
 
 //-----------------------------------------------------------------------------
-int AnsRecv(void * data, list<string> * list1)
+void ElementStart(void *data, const char *el, const char **attr)
 {
 SERVCONF * sc = static_cast<SERVCONF *>(data);
+sc->Start(el, attr);
+}
+//-----------------------------------------------------------------------------
+void ElementEnd(void * data, const char * el)
+{
+SERVCONF * sc = static_cast<SERVCONF *>(data);
+sc->End(el);
+}
 
-XML_ParserReset(sc->parser, NULL);
-XML_SetElementHandler(sc->parser, Start, End);
-XML_SetUserData(sc->parser, data);
-
-char ans[ENC_MSG_LEN + 1];
-int len, done = 0;
+} // namespace anonymous
 
-//loop parsing
-list<string>::iterator node;
-node = list1->begin();
+bool AnsRecv(void * data, const std::string & chunk, bool final)
+{
+SERVCONF * sc = static_cast<SERVCONF *>(data);
+printf("Chunk: '%s', length: %d, final: %d\n", chunk.c_str(), chunk.length(), final);
 
-while (node != list1->end())
+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;
-}
-//-----------------------------------------------------------------------------
-void Start(void *data, const char *el, const char **attr)
-{
-SERVCONF * sc;
-sc = (SERVCONF*)data;
-sc->Start(el, attr);
-}
-//-----------------------------------------------------------------------------
-void End(void *data, const char *el)
-{
-SERVCONF * sc;
-sc = (SERVCONF*)data;
-sc->End(el);
+return true;
 }
+
 //-----------------------------------------------------------------------------
-SERVCONF::SERVCONF()
+SERVCONF::SERVCONF(const std::string & server, uint16_t port,
+                   const std::string & login, const std::string & password)
     : currParser(NULL),
-      RecvSendMessageCb(NULL),
-      sendMessageDataCb(NULL)
+      nt( server, port, login, password )
 {
 parser = XML_ParserCreate(NULL);
 nt.SetRxCallback(this, AnsRecv);
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetServer(const char * server)
-{
-nt.SetServer(server);
-}
-//-----------------------------------------------------------------------------
-void SERVCONF::SetPort(uint16_t port)
-{
-nt.SetServerPort(port);
-}
-//-----------------------------------------------------------------------------
-void SERVCONF::SetAdmLogin(const char * login)
-{
-nt.SetLogin(login);
-}
-//-----------------------------------------------------------------------------
-void SERVCONF::SetAdmPassword(const char * password)
-{
-nt.SetPassword(password);
-}
-//-----------------------------------------------------------------------------
 int SERVCONF::GetUser(const char * l)
 {
 char request[255];
@@ -139,19 +96,6 @@ char request[] = "<GetUsers/>";
 
 currParser = &parserGetUsers;
 
-return Exec(request);
-}
-//-----------------------------------------------------------------------------
-int SERVCONF::SendMessage(const char * login, const char * message, int prio)
-{
-char request[1000];
-char msg[500];
-Encode12(msg, message, strlen(message));
-snprintf(request, 1000, "<Message login=\"%s\" priority=\"%d\" text=\"%s\"/>", login, prio, msg);
-
-currParser = &parserSendMessage;
-parserSendMessage.SetSendMessageRecvCb(RecvSendMessageCb, sendMessageDataCb);
-
 return Exec(request);
 }
 //-----------------------------------------------------------------------------
@@ -171,12 +115,9 @@ currParser = &parserChgUser;
 return Exec(request);
 }
 //-----------------------------------------------------------------------------
-//  TODO: remove this shit!
-//-----------------------------------------------------------------------------
-int SERVCONF::MsgUser(const char * request)
+int SERVCONF::SendMessage(const char * request)
 {
 currParser = &parserSendMessage;
-parserSendMessage.SetSendMessageRecvCb(RecvSendMessageCb, sendMessageDataCb);
 
 return Exec(request);
 }
@@ -191,13 +132,13 @@ currParser = &parserCheckUser;
 return Exec(request);
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::Start(const char *el, const char **attr)
+int SERVCONF::Start(const char * el, const char ** attr)
 {
 currParser->ParseStart(el, attr);
 return 0;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::End(const char *el)
+void SERVCONF::End(const char * el)
 {
 currParser->ParseEnd(el);
 }
@@ -232,10 +173,9 @@ void SERVCONF::SetCheckUserCallback(PARSER_CHECK_USER::CALLBACK f, void * data)
 parserCheckUser.SetCallback(f, data);
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetSendMessageCb(RecvSendMessageCb_t f, void * data)
+void SERVCONF::SetSendMessageCallback(PARSER_SEND_MESSAGE::CALLBACK f, void * data)
 {
-RecvSendMessageCb = f;
-sendMessageDataCb = data;
+parserSendMessage.SetCallback(f, data);
 }
 //-----------------------------------------------------------------------------
 const std::string & SERVCONF::GetStrError() const
@@ -245,7 +185,9 @@ return errorMsg;
 //-----------------------------------------------------------------------------
 int SERVCONF::Exec(const char * request)
 {
-nt.Reset();
+XML_ParserReset(parser, NULL);
+XML_SetElementHandler(parser, ElementStart, ElementEnd);
+XML_SetUserData(parser, this);
 
 int ret = 0;
 if ((ret = nt.Connect()) != st_ok)