Ticket. InToTraffType() function declaration and definition added.

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

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
index 797b4c46c3835f86186e516fd6f9f619b83aeadb..67e2c6996a07dd840cec07164d002945241a1f49 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
@@ -26,7 +26,6 @@
 #include "stg/user_property.h"
 #include "stg/user_conf.h"
 #include "stg/user_stat.h"
 #include "stg/user_property.h"
 #include "stg/user_conf.h"
 #include "stg/user_stat.h"

-#include "stg/common.h"

 
 #include <cstdio>
 #include <cassert>
 
 #include <cstdio>
 #include <cassert>


@@ -38,6 +37,13 @@ using STG::PARSER::DEL_USER;
 using STG::PARSER::CHG_USER;
 using STG::PARSER::CHECK_USER;
 
 using STG::PARSER::CHG_USER;
 using STG::PARSER::CHECK_USER;
 

+const char * GET_USERS::tag  = "GetUsers";
+const char * GET_USER::tag   = "GetUser";
+const char * ADD_USER::tag   = "AddUser";
+const char * CHG_USER::tag   = "SetUser";
+const char * DEL_USER::tag   = "DelUser";
+const char * CHECK_USER::tag = "CheckUser";
+

 namespace
 {
 
 namespace
 {
 


@@ -170,7 +176,10 @@ std::string UserToXML(const USER & user, bool loginInStart, bool showPass, time_
 int GET_USERS::Start(void *, const char * el, const char ** attr)
 {
     if (strcasecmp(el, m_tag.c_str()) != 0)
 int GET_USERS::Start(void *, const char * el, const char ** attr)
 {
     if (strcasecmp(el, m_tag.c_str()) != 0)

+    {
+        printfd(__FILE__, "Got wrong tag: '%s' instead of '%s'\n", el, m_tag.c_str());

         return -1;
         return -1;

+    }

 
     while (attr && *attr && *(attr + 1))
     {
 
     while (attr && *attr && *(attr + 1))
     {


@@ -188,9 +197,9 @@ void GET_USERS::CreateAnswer()
     assert(h);
 
     if (m_lastUserUpdateTime > 0)
     assert(h);
 
     if (m_lastUserUpdateTime > 0)

-        m_answer = "<" + m_tag + " LastUpdate=\"" + x2str(time(NULL)) + "\">";
+        m_answer = "<Users LastUpdate=\"" + x2str(time(NULL)) + "\">";

     else
     else

-        m_answer = GetOpenTag();
+        m_answer = "<Users>";

 
     USER_PTR u;
 
 
     USER_PTR u;
 


@@ -199,7 +208,7 @@ void GET_USERS::CreateAnswer()
 
     m_users.CloseSearch(h);
 
 
     m_users.CloseSearch(h);
 

-    m_answer += GetCloseTag();
+    m_answer += "</Users>";

 }
 
 int GET_USER::Start(void *, const char * el, const char ** attr)
 }
 
 int GET_USER::Start(void *, const char * el, const char ** attr)


@@ -219,7 +228,7 @@ void GET_USER::CreateAnswer()
     CONST_USER_PTR u;
 
     if (m_users.FindByName(m_login, &u))
     CONST_USER_PTR u;
 
     if (m_users.FindByName(m_login, &u))

-        m_answer = "<" + m_tag + " result=\"error\" reason=\"User not found.\"/>";
+        m_answer = "<User result=\"error\" reason=\"User not found.\"/>";

     else
         m_answer = UserToXML(*u, false, m_currAdmin.GetPriv()->userConf || m_currAdmin.GetPriv()->userPasswd);
 }
     else
         m_answer = UserToXML(*u, false, m_currAdmin.GetPriv()->userConf || m_currAdmin.GetPriv()->userPasswd);
 }


@@ -673,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;


@@ -722,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;
 }