Add subscriptions (to replace notifiers).

[stg.git] / libs / srvconf / parsers / get_corp.cpp

diff --git a/libs/srvconf/parsers/get_corp.cpp b/libs/srvconf/parsers/get_corp.cpp
index 0a6a1e02cdc114389215ecda8004cde8f0da7327..e5563ad58b4497c9a6c376e22444007f69ebd1ba 100644 (file)
--- a/libs/srvconf/parsers/get_corp.cpp
+++ b/libs/srvconf/parsers/get_corp.cpp
@@ -20,79 +20,77 @@
 
 #include "get_corp.h"
 
 
 #include "get_corp.h"
 

-//#include "parsers/property.h"
-

 #include "stg/common.h"
 
 #include <strings.h>
 
 using namespace STG;
 
 #include "stg/common.h"
 
 #include <strings.h>
 
 using namespace STG;
 

-GET_CORP::PARSER::PARSER(CALLBACK f, void * d, const std::string & e)
+GetCorp::Parser::Parser(Callback f, void* d, const std::string& e)

     : callback(f),
       data(d),
       encoding(e),
       depth(0),
       parsingAnswer(false)
 {
     : callback(f),
       data(d),
       encoding(e),
       depth(0),
       parsingAnswer(false)
 {

-    AddParser(propertyParsers, "name", info.name);
-    AddParser(propertyParsers, "cash", info.cash);
+    addParser(propertyParsers, "name", info.name);
+    addParser(propertyParsers, "cash", info.cash);

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-GET_CORP::PARSER::~PARSER()
+GetCorp::Parser::~Parser()

 {
 {

-    PROPERTY_PARSERS::iterator it(propertyParsers.begin());
+    auto it = propertyParsers.begin();

     while (it != propertyParsers.end())
         delete (it++)->second;
 }
 //-----------------------------------------------------------------------------
     while (it != propertyParsers.end())
         delete (it++)->second;
 }
 //-----------------------------------------------------------------------------

-int GET_CORP::PARSER::ParseStart(const char * el, const char ** attr)
+int GetCorp::Parser::ParseStart(const char* el, const char** attr)

 {
 {

-depth++;
-if (depth == 1)
-    ParseCorp(el, attr);
+    depth++;
+    if (depth == 1)
+        ParseCorp(el, attr);

 
 

-if (depth == 2 && parsingAnswer)
-    ParseCorpParams(el, attr);
+    if (depth == 2 && parsingAnswer)
+        ParseCorpParams(el, attr);

 
 

-return 0;
+    return 0;

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void GET_CORP::PARSER::ParseEnd(const char * /*el*/)
+void GetCorp::Parser::ParseEnd(const char* /*el*/)

 {
 {

-depth--;
-if (depth == 0 && parsingAnswer)
+    depth--;
+    if (depth == 0 && parsingAnswer)

     {
     {

-    if (callback)
-        callback(error.empty(), error, info, data);
-    error.clear();
-    parsingAnswer = false;
+        if (callback)
+            callback(error.empty(), error, info, data);
+        error.clear();
+        parsingAnswer = false;

     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

-void GET_CORP::PARSER::ParseCorp(const char * el, const char ** attr)
+void GetCorp::Parser::ParseCorp(const char* el, const char** attr)

 {
 {

-if (strcasecmp(el, "corp") == 0)
+    if (strcasecmp(el, "corp") == 0)

     {
     {

-    if (attr && attr[0] && attr[1])
+        if (attr && attr[0] && attr[1])

         {
         {

-        if (strcasecmp(attr[1], "error") == 0)
+            if (strcasecmp(attr[1], "error") == 0)

             {
             {

-            if (attr[2] && attr[3])
-                error = attr[3];
-            else
-                error = "Corp not found.";
+                if (attr[2] && attr[3])
+                    error = attr[3];
+                else
+                    error = "Corp not found.";

             }
             }

+            else
+                parsingAnswer = true;
+        }

         else
             parsingAnswer = true;
         else
             parsingAnswer = true;

-        }
-    else
-        parsingAnswer = true;

     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

-void GET_CORP::PARSER::ParseCorpParams(const char * el, const char ** attr)
+void GetCorp::Parser::ParseCorpParams(const char* el, const char** attr)

 {
 {

-if (!TryParse(propertyParsers, ToLower(el), attr, encoding))
-    error = "Invalid parameter.";
+    if (!tryParse(propertyParsers, ToLower(el), attr, encoding))
+        error = "Invalid parameter.";

 }
 }