Added "done" signature for parsers.

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
index 0371798197d287aaf4d8e5f778b0efdbcf4e1944..e52eb3faf72f828e79c7eac31df1fa279511fe96 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
@@ -40,6 +40,7 @@ int BASE_PARSER::End(void *, const char * el)
         if (strcasecmp(el, m_tag.c_str()) != 0)
             return -1;
         CreateAnswer();
         if (strcasecmp(el, m_tag.c_str()) != 0)
             return -1;
         CreateAnswer();

+        m_done = true;

     }
 
     --m_depth;
     }
 
     --m_depth;

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.h b/projects/stargazer/plugins/configuration/sgconfig/parser.h
index af77158d6324d1032a922d9c503fa45b9035fe58..4e4b94173c2beb8f4d61a522550390532b487245 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser.h
@@ -38,7 +38,8 @@ class BASE_PARSER
         BASE_PARSER(const ADMIN & admin, const std::string & t)
             : m_currAdmin(admin),
               m_depth(0),
         BASE_PARSER(const ADMIN & admin, const std::string & t)
             : m_currAdmin(admin),
               m_depth(0),

-              m_tag(t)
+              m_tag(t),
+              m_done(false)

         {}
         virtual ~BASE_PARSER() {}
         virtual int Start(void * data, const char * el, const char ** attr);
         {}
         virtual ~BASE_PARSER() {}
         virtual int Start(void * data, const char * el, const char ** attr);


@@ -49,6 +50,8 @@ class BASE_PARSER
         std::string GetOpenTag() const { return "<" + m_tag + ">"; }
         std::string GetCloseTag() const { return "</" + m_tag + ">"; }
 
         std::string GetOpenTag() const { return "<" + m_tag + ">"; }
         std::string GetCloseTag() const { return "</" + m_tag + ">"; }
 

+        bool IsDone() const { return m_done; }
+

     protected:
         BASE_PARSER(const BASE_PARSER & rvalue);
         BASE_PARSER & operator=(const BASE_PARSER & rvalue);
     protected:
         BASE_PARSER(const BASE_PARSER & rvalue);
         BASE_PARSER & operator=(const BASE_PARSER & rvalue);


@@ -57,6 +60,7 @@ class BASE_PARSER
         size_t        m_depth;
         std::string   m_answer;
         std::string   m_tag;
         size_t        m_depth;
         std::string   m_answer;
         std::string   m_tag;

+        bool          m_done;

 
     private:
         virtual void CreateAnswer() = 0;
 
     private:
         virtual void CreateAnswer() = 0;

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_message.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_message.cpp
index 06489a4246214166b28da83fbcf32e877fa7545c..2279aae6c6519e8968007a215426208b5424a069 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_message.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_message.cpp
@@ -102,6 +102,7 @@ int SEND_MESSAGE::End(void *, const char *el)
         m_result = res_ok;
     }
     CreateAnswer();
         m_result = res_ok;
     }
     CreateAnswer();

+    m_done = true;

     return 0;
 }
 
     return 0;
 }
 

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
index cd66ec9e037741a95368ceb03f9512acb9cc4e82..67e2c6996a07dd840cec07164d002945241a1f49 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
@@ -682,6 +682,8 @@ int DEL_USER::End(void *, const char *el)
         if (!res)
             m_users.Del(u->GetLogin(), &m_currAdmin);
 
         if (!res)
             m_users.Del(u->GetLogin(), &m_currAdmin);
 

+        m_done = true;
+

         return 0;
     }
     return -1;
         return 0;
     }
     return -1;


@@ -731,7 +733,10 @@ int CHECK_USER::Start(void *, const char *el, const char **attr)
 int CHECK_USER::End(void *, const char *el)
 {
     if (strcasecmp(el, m_tag.c_str()) == 0)
 int CHECK_USER::End(void *, const char *el)
 {
     if (strcasecmp(el, m_tag.c_str()) == 0)

+    {
+        m_done = true;

         return 0;
         return 0;

+    }

     return -1;
 }
 
     return -1;
 }