Replaced API functor with API function.

[stg.git] / projects / sgconf / main.cpp

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index 9025602e541288294bc25bf7d7880f2befb5f3b8..3ad0519eb2af722a3eba2357a87de1d9a477120e 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -135,14 +135,14 @@ array[pos] = value;
 return true;
 }
 
-void RawXMLCallback(bool result, const std::string & reason, const std::string & response, void * data)
+void RawXMLCallback(bool result, const std::string & reason, const std::string & response, void * /*data*/)
 {
 if (!result)
     {
     std::cerr << "Failed to get raw XML response. Reason: '" << reason << "'." << std::endl;
     return;
     }
-PrintXML(response);
+SGCONF::PrintXML(response);
 }
 
 void Usage();
@@ -187,7 +187,7 @@ namespace SGCONF
 class CONFIG_ACTION : public ACTION
 {
     public:
-        CONFIG_ACTION(CONFIG & config,
+        CONFIG_ACTION(SGCONF::CONFIG & config,
                       const std::string & paramDescription)
             : m_config(config),
               m_description(paramDescription)
@@ -201,7 +201,7 @@ class CONFIG_ACTION : public ACTION
         virtual PARSER_STATE Parse(int argc, char ** argv);
 
     private:
-        CONFIG & m_config;
+        SGCONF::CONFIG & m_config;
         std::string m_description;
         OPTION_BLOCK m_suboptions;
 
@@ -209,29 +209,77 @@ class CONFIG_ACTION : public ACTION
         void ParseHostAndPort(const std::string & hostAndPort);
 };
 
-class COMMAND_FUNCTOR
+typedef bool (* API_FUNCTION) (const SGCONF::CONFIG &,
+                               const std::string &,
+                               const std::map<std::string, std::string> &);
+
+class COMMAND
 {
     public:
-        virtual ~COMMAND_FUNCTOR() {}
-        virtual bool operator()(const std::string& arg, const std::map<std::string, std::string>& options) = 0;
+        COMMAND(API_FUNCTION funPtr,
+                const std::string & arg,
+                const std::map<std::string, std::string> & options)
+            : m_funPtr(funPtr),
+              m_arg(arg),
+              m_options(options)
+        {}
+        bool Execute(const SGCONF::CONFIG & config) const
+        {
+            return m_funPtr(config, m_arg, m_options);
+        }
+
+    private:
+        API_FUNCTION m_funPtr;
+        std::string m_arg;
+        std::map<std::string, std::string> m_options;
 };
 
-class COMMAND_ACTION : public ACTION
+class COMMANDS
 {
     public:
-        COMMAND_ACTION(CONFIG & config,
-                       const std::string & paramDescription,
-                       bool needArgument,
-                       const OPTION_BLOCK& suboptions,
-                       COMMAND_FUNCTOR* funPtr)
-            : m_config(config),
+        void Add(API_FUNCTION funPtr,
+                 const std::string & arg,
+                 const std::map<std::string, std::string> & options) { m_commands.push_back(COMMAND(funPtr, arg, options)); }
+        bool Execute(const SGCONF::CONFIG & config) const
+        {
+            std::list<COMMAND>::const_iterator it(m_commands.begin());
+            bool res = true;
+            while (it != m_commands.end() && res)
+            {
+                res = res && it->Execute(config);
+                ++it;
+            }
+            return res;
+        }
+    private:
+        std::list<COMMAND> m_commands;
+};
+
+class API_ACTION : public ACTION
+{
+    public:
+        API_ACTION(COMMANDS & commands,
+                   const std::string & paramDescription,
+                   bool needArgument,
+                   const OPTION_BLOCK& suboptions,
+                   API_FUNCTION funPtr)
+            : m_commands(commands),
               m_description(paramDescription),
-              m_argument(needArgument),
+              m_argument(needArgument ? "1" : ""), // Hack
               m_suboptions(suboptions),
               m_funPtr(funPtr)
         {}
+        API_ACTION(COMMANDS & commands,
+                   const std::string & paramDescription,
+                   bool needArgument,
+                   API_FUNCTION funPtr)
+            : m_commands(commands),
+              m_description(paramDescription),
+              m_argument(needArgument ? "1" : ""), // Hack
+              m_funPtr(funPtr)
+        {}
 
-        virtual ACTION * Clone() const { return new COMMAND_ACTION(*this); }
+        virtual ACTION * Clone() const { return new API_ACTION(*this); }
 
         virtual std::string ParamDescription() const { return m_description; }
         virtual std::string DefaultDescription() const { return ""; }
@@ -239,7 +287,7 @@ class COMMAND_ACTION : public ACTION
         virtual PARSER_STATE Parse(int argc, char ** argv)
         {
         PARSER_STATE state(false, argc, argv);
-        if (m_argument)
+        if (!m_argument.empty())
             {
             if (argc == 0 ||
                 argv == NULL ||
@@ -249,24 +297,18 @@ class COMMAND_ACTION : public ACTION
             --state.argc;
             ++state.argv;
             }
-        std::list<OPTION_BLOCK>::iterator it(m_suboptions.begin());
-        while (!state.stop && it != m_suboptions.end())
-            {
-            state = it->Parse(state.argc, state.argv);
-            ++it;
-            }
-        m_funPtr(m_argument, m_params);
+        m_suboptions.Parse(state.argc, state.argv);
+        m_commands.Add(m_funPtr, m_argument, m_params);
         return state;
         }
 
     private:
-        CONFIG & m_config;
+        COMMANDS & m_commands;
         std::string m_description;
-        bool m_needArgument;
         std::string m_argument;
         OPTION_BLOCK m_suboptions;
         std::map<std::string, std::string> m_params;
-        COMMAND_FUNCTOR* m_funPtr;
+        API_FUNCTION m_funPtr;
 };
 
 PARSER_STATE CONFIG_ACTION::Parse(int argc, char ** argv)
@@ -320,12 +362,32 @@ else
 }
 
 inline
-CONFIG_ACTION * MakeParamAction(CONFIG & config,
+CONFIG_ACTION * MakeParamAction(SGCONF::CONFIG & config,
                                 const std::string & paramDescription)
 {
 return new CONFIG_ACTION(config, paramDescription);
 }
 
+inline
+ACTION * MakeAPIAction(COMMANDS & commands,
+                       const std::string & paramDescription,
+                       bool needArgument,
+                       API_FUNCTION funPtr)
+{
+return new API_ACTION(commands, paramDescription, needArgument, funPtr);
+}
+
+bool RawXMLFunction(const SGCONF::CONFIG & config,
+                    const std::string & arg,
+                    const std::map<std::string, std::string> & /*options*/)
+{
+    STG::SERVCONF proto(config.server.data(),
+                        config.port.data(),
+                        config.userName.data(),
+                        config.userPass.data());
+    return proto.RawXML(arg, RawXMLCallback, NULL) == STG::st_ok;
+}
+
 } // namespace SGCONF
 
 time_t stgTime;
@@ -1297,6 +1359,7 @@ return ProcessSetUser(req.server.data(), req.port.data(), req.admLogin.data(), r
 int main(int argc, char **argv)
 {
 SGCONF::CONFIG config;
+SGCONF::COMMANDS commands;
 
 SGCONF::OPTION_BLOCKS blocks;
 blocks.Add("General options")
@@ -1311,7 +1374,7 @@ SGCONF::OPTION_BLOCK & block = blocks.Add("Connection options")
       .Add("w", "userpass", SGCONF::MakeParamAction(config.userPass, "<password>"), "\tpassword for the administrative login")
       .Add("a", "address", SGCONF::MakeParamAction(config, "<connection string>"), "connection params as a single string in format: <login>:<password>@<host>:<port>");
 blocks.Add("Raw XML")
-      .Add("r", "raw", SGCONF::MakeFunc1Action(), "\t\tmake raw XML request")
+      .Add("r", "raw", SGCONF::MakeAPIAction(commands, "<xml>", true, SGCONF::RawXMLFunction), "\tmake raw XML request");
 /*blocks.Add("Admins management options")
       .Add("get-admins", SGCONF::MakeConfAction())
       .Add("get-admin", SGCONF::MakeConfAction())
@@ -1366,8 +1429,9 @@ return -1;
 }
 
 std::cerr << "Config: " << config.Serialize() << std::endl;
+return commands.Execute(config) ? 0 : -1;
 
-return 0;
+/*return 0;
 
 if (argc < 2)
     {
@@ -1398,7 +1462,7 @@ else
     UsageConf();
     exit(PARAMETER_PARSING_ERR_CODE);
     }
-return UNKNOWN_ERR_CODE;
+return UNKNOWN_ERR_CODE;*/
 }
 //-----------------------------------------------------------------------------