User parser refactoring.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / configproto.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
index a5ffcf5b3c5d4a4828d26245cd3e117c6c5a1be6..dff8760a7a867f65600e76727032e2cea028f7c9 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@ -49,23 +49,23 @@ CONFIGPROTO * cp = static_cast<CONFIGPROTO *>(data);
 
 if (cp->currParser)
     {
 
 if (cp->currParser)
     {

-    cp->currParser->SetCurrAdmin(*cp->currAdmin);
-    cp->currParser->ParseStart(data, el, attr);
+    //cp->currParser->SetCurrAdmin(*cp->currAdmin);
+    cp->currParser->Start(data, el, attr);

     }
 else
     {
     for (size_t i = 0; i < cp->dataParser.size(); i++)
         {
     }
 else
     {
     for (size_t i = 0; i < cp->dataParser.size(); i++)
         {

-        cp->dataParser[i]->SetCurrAdmin(*cp->currAdmin);
-        cp->dataParser[i]->Reset();
-        if (cp->dataParser[i]->ParseStart(data, el, attr) == 0)
+        //cp->dataParser[i]->SetCurrAdmin(*cp->currAdmin);
+        //cp->dataParser[i]->Reset();
+        if (cp->dataParser[i]->Start(data, el, attr) == 0)

             {
             cp->currParser = cp->dataParser[i];
             break;
             }
         else
             {
             {
             cp->currParser = cp->dataParser[i];
             break;
             }
         else
             {

-            cp->dataParser[i]->Reset();
+            //cp->dataParser[i]->Reset();

             }
         }
     }
             }
         }
     }


@@ -76,8 +76,9 @@ void ParseXMLEnd(void *data, const char *el)
 CONFIGPROTO * cp = static_cast<CONFIGPROTO *>(data);
 if (cp->currParser)
     {
 CONFIGPROTO * cp = static_cast<CONFIGPROTO *>(data);
 if (cp->currParser)
     {

-    if (cp->currParser->ParseEnd(data, el) == 0)
+    if (cp->currParser->End(data, el) == 0)

         {
         {

+        cp->dataAnswer = cp->currParser->GetAnswer();

         cp->currParser = NULL;
         }
     }
         cp->currParser = NULL;
         }
     }


@@ -85,8 +86,10 @@ else
     {
     for (size_t i = 0; i < cp->dataParser.size(); i++)
         {
     {
     for (size_t i = 0; i < cp->dataParser.size(); i++)
         {

-        if (cp->dataParser[i]->ParseEnd(data, el) == 0)
+        if (cp->dataParser[i]->End(data, el) == 0)

             {
             {

+            cp->dataAnswer = cp->currParser->GetAnswer();
+            cp->currParser = NULL;

             break;
             }
         }
             break;
             }
         }


@@ -104,7 +107,7 @@ CONFIGPROTO::CONFIGPROTO(PLUGIN_LOGGER & l)
       admins(NULL),
       currParser(NULL)
 {
       admins(NULL),
       currParser(NULL)
 {

-dataParser.push_back(new PARSER_GET_SERVER_INFO);
+/*dataParser.push_back(new PARSER_GET_SERVER_INFO);

 
 dataParser.push_back(new PARSER_GET_USERS);
 dataParser.push_back(new PARSER_GET_USER);
 
 dataParser.push_back(new PARSER_GET_USERS);
 dataParser.push_back(new PARSER_GET_USER);


@@ -124,7 +127,7 @@ dataParser.push_back(new PARSER_CHG_TARIFF);
 dataParser.push_back(new PARSER_GET_ADMINS);
 dataParser.push_back(new PARSER_CHG_ADMIN);
 dataParser.push_back(new PARSER_DEL_ADMIN);
 dataParser.push_back(new PARSER_GET_ADMINS);
 dataParser.push_back(new PARSER_CHG_ADMIN);
 dataParser.push_back(new PARSER_DEL_ADMIN);

-dataParser.push_back(new PARSER_ADD_ADMIN);
+dataParser.push_back(new PARSER_ADD_ADMIN);*/

 
 xmlParser = XML_ParserCreate(NULL);
 
 
 xmlParser = XML_ParserCreate(NULL);