Merge branch 'stg-2.409-radius'

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / parser_admins.h

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_admins.h b/projects/stargazer/plugins/configuration/sgconfig/parser_admins.h
index 63ee627836334600947756c0e7a715d2b6995f94..70ae02742956ba5e880a56072d2beb8f925de950 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_admins.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_admins.h
@@ -24,6 +24,7 @@
 
 #include "parser.h"
 
+#include "stg/common.h"
 #include "stg/resetable.h"
 
 #include <string>
@@ -39,8 +40,21 @@ namespace PARSER
 class GET_ADMINS: public BASE_PARSER
 {
     public:
+        class FACTORY : public BASE_PARSER::FACTORY
+        {
+            public:
+                explicit FACTORY(const ADMINS & admins) : m_admins(admins) {}
+                virtual BASE_PARSER * create(const ADMIN & admin) { return new GET_ADMINS(admin, m_admins); }
+                static void Register(REGISTRY & registry, const ADMINS & admins)
+                { registry[ToLower(tag)] = new FACTORY(admins); }
+            private:
+                const ADMINS & m_admins;
+        };
+
+        static const char * tag;
+
         GET_ADMINS(const ADMIN & admin, const ADMINS & admins)
-            : BASE_PARSER(admin, "GetAdmins"), m_admins(admins) {}
+            : BASE_PARSER(admin, tag), m_admins(admins) {}
 
     private:
         const ADMINS & m_admins;
@@ -51,12 +65,25 @@ class GET_ADMINS: public BASE_PARSER
 class ADD_ADMIN: public BASE_PARSER
 {
     public:
+        class FACTORY : public BASE_PARSER::FACTORY
+        {
+            public:
+                explicit FACTORY(ADMINS & admins) : m_admins(admins) {}
+                virtual BASE_PARSER * create(const ADMIN & admin) { return new ADD_ADMIN(admin, m_admins); }
+                static void Register(REGISTRY & registry, ADMINS & admins)
+                { registry[ToLower(tag)] = new FACTORY(admins); }
+            private:
+                ADMINS & m_admins;
+        };
+
+        static const char * tag;
+
         ADD_ADMIN(const ADMIN & admin, ADMINS & admins)
-            : BASE_PARSER(admin, "AddAdmin"), m_admins(admins) {}
+            : BASE_PARSER(admin, tag), m_admins(admins) {}
         int Start(void * data, const char * el, const char ** attr);
 
     private:
-        std::string admin;
+        std::string m_admin;
         ADMINS & m_admins;
 
         void CreateAnswer();
@@ -65,12 +92,25 @@ class ADD_ADMIN: public BASE_PARSER
 class DEL_ADMIN: public BASE_PARSER
 {
     public:
+        class FACTORY : public BASE_PARSER::FACTORY
+        {
+            public:
+                explicit FACTORY(ADMINS & admins) : m_admins(admins) {}
+                virtual BASE_PARSER * create(const ADMIN & admin) { return new DEL_ADMIN(admin, m_admins); }
+                static void Register(REGISTRY & registry, ADMINS & admins)
+                { registry[ToLower(tag)] = new FACTORY(admins); }
+            private:
+                ADMINS & m_admins;
+        };
+
+        static const char * tag;
+
         DEL_ADMIN(const ADMIN & admin, ADMINS & admins)
-            : BASE_PARSER(admin, "DelAdmin"), m_admins(admins) {}
+            : BASE_PARSER(admin, tag), m_admins(admins) {}
         int Start(void * data, const char * el, const char ** attr);
 
     private:
-        std::string admin;
+        std::string m_admin;
         ADMINS & m_admins;
 
         void CreateAnswer();
@@ -79,8 +119,21 @@ class DEL_ADMIN: public BASE_PARSER
 class CHG_ADMIN: public BASE_PARSER
 {
     public:
+        class FACTORY : public BASE_PARSER::FACTORY
+        {
+            public:
+                explicit FACTORY(ADMINS & admins) : m_admins(admins) {}
+                virtual BASE_PARSER * create(const ADMIN & admin) { return new CHG_ADMIN(admin, m_admins); }
+                static void Register(REGISTRY & registry, ADMINS & admins)
+                { registry[ToLower(tag)] = new FACTORY(admins); }
+            private:
+                ADMINS & m_admins;
+        };
+
+        static const char * tag;
+
         CHG_ADMIN(const ADMIN & admin, ADMINS & admins)
-            : BASE_PARSER(admin, "ChgAdmin"), m_admins(admins) {}
+            : BASE_PARSER(admin, tag), m_admins(admins) {}
         int Start(void * data, const char * el, const char ** attr);
 
     private:
@@ -92,7 +145,7 @@ class CHG_ADMIN: public BASE_PARSER
         void CreateAnswer();
 };
 
-}
-}
+} // namespace PARSER
+} // namespace STG
 
 #endif