[NY Flight] Improvements in parser dispatching.

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

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index d48424e0de2452b801322bab0c80f5e60da89a51..621cced022685e37716e8ee221f10ed6d7ea11cc 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>
  */
 
  *    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"
 #include "stg/servconf.h"
 
 #include "stg/common.h"


@@ -31,96 +25,55 @@
 #include <cstdio>
 #include <cstring>
 
 #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);
 {
 SERVCONF * sc = static_cast<SERVCONF *>(data);

+sc->Start(el, attr);
+}

 
 

-XML_ParserReset(sc->parser, NULL);
-XML_SetElementHandler(sc->parser, Start, End);
-XML_SetUserData(sc->parser, data);
+void ElementEnd(void * data, const char * el)
+{
+SERVCONF * sc = static_cast<SERVCONF *>(data);
+sc->End(el);
+}

 
 

-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);

 
 

-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),
     : currParser(NULL),

-      RecvSendMessageCb(NULL),
-      sendMessageDataCb(NULL)
+      nt( server, port, login, password )

 {
 parser = XML_ParserCreate(NULL);
 nt.SetRxCallback(this, AnsRecv);
 }
 //-----------------------------------------------------------------------------
 {
 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];
 snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
 
 int SERVCONF::GetUser(const char * l)
 {
 char request[255];
 snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
 

-currParser = &parserGetUser;
-
-return Exec(request);
+return Exec(request, parserGetUser);

 }
 //-----------------------------------------------------------------------------
 int SERVCONF::AuthBy(const char * l)
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::AuthBy(const char * l)


@@ -128,41 +81,31 @@ int SERVCONF::AuthBy(const char * l)
 char request[255];
 snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);
 
 char request[255];
 snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);
 

-currParser = &parserAuthBy;
-
-return Exec(request);
+return Exec(request, parserAuthBy);

 }
 //-----------------------------------------------------------------------------
 int SERVCONF::GetUsers()
 {
 char request[] = "<GetUsers/>";
 
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::GetUsers()
 {
 char request[] = "<GetUsers/>";
 

-currParser = &parserGetUsers;
-
-return Exec(request);
+return Exec(request, parserGetUsers);

 }
 //-----------------------------------------------------------------------------
 int SERVCONF::ServerInfo()
 {
 char request[] = "<GetServerInfo/>";
 
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::ServerInfo()
 {
 char request[] = "<GetServerInfo/>";
 

-currParser = &parserServerInfo;
-
-return Exec(request);
+return Exec(request, parserServerInfo);

 }
 //-----------------------------------------------------------------------------
 int SERVCONF::ChgUser(const char * request)
 {
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::ChgUser(const char * request)
 {

-currParser = &parserChgUser;
-
-return Exec(request);
+return Exec(request, parserChgUser);

 }
 //-----------------------------------------------------------------------------
 int SERVCONF::SendMessage(const char * request)
 {
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::SendMessage(const char * request)
 {

-currParser = &parserSendMessage;
-
-return Exec(request);
+return Exec(request, parserSendMessage);

 }
 //-----------------------------------------------------------------------------
 int SERVCONF::CheckUser(const char * login, const char * password)
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::CheckUser(const char * login, const char * password)


@@ -170,9 +113,7 @@ int SERVCONF::CheckUser(const char * login, const char * password)
 char request[255];
 snprintf(request, 255, "<CheckUser login=\"%s\" password=\"%s\"/>", login, password);
 
 char request[255];
 snprintf(request, 255, "<CheckUser login=\"%s\" password=\"%s\"/>", login, password);
 

-currParser = &parserCheckUser;
-
-return Exec(request);
+return Exec(request, parserCheckUser);

 }
 //-----------------------------------------------------------------------------
 int SERVCONF::Start(const char * el, const char ** attr)
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::Start(const char * el, const char ** attr)


@@ -226,9 +167,13 @@ const std::string & SERVCONF::GetStrError() const
 return errorMsg;
 }
 //-----------------------------------------------------------------------------
 return errorMsg;
 }
 //-----------------------------------------------------------------------------

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

 {
 {

-nt.Reset();
+currParser = &cp;
+
+XML_ParserReset(parser, NULL);
+XML_SetElementHandler(parser, ElementStart, ElementEnd);
+XML_SetUserData(parser, this);

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