Implemented raw XML API for sgconf.

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

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index 3280e336494e632f3178498a9057a90c3404a07c..9ae82cc560d81d2ba6d524e429a644385d354a01 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -23,6 +23,7 @@
 #include "common_sg.h"
 #include "sg_error_codes.h"
 
 #include "common_sg.h"
 #include "sg_error_codes.h"
 

+#include "xml.h"

 #include "options.h"
 #include "actions.h"
 #include "config.h"
 #include "options.h"
 #include "actions.h"
 #include "config.h"


@@ -134,6 +135,16 @@ array[pos] = value;
 return true;
 }
 
 return true;
 }
 

+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;
+    }
+SGCONF::PrintXML(response);
+}
+

 void Usage();
 void UsageAll();
 void UsageImpl(bool full);
 void Usage();
 void UsageAll();
 void UsageImpl(bool full);


@@ -176,7 +187,7 @@ namespace SGCONF
 class CONFIG_ACTION : public ACTION
 {
     public:
 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)
                       const std::string & paramDescription)
             : m_config(config),
               m_description(paramDescription)


@@ -190,7 +201,7 @@ class CONFIG_ACTION : public ACTION
         virtual PARSER_STATE Parse(int argc, char ** argv);
 
     private:
         virtual PARSER_STATE Parse(int argc, char ** argv);
 
     private:

-        CONFIG & m_config;
+        SGCONF::CONFIG & m_config;

         std::string m_description;
         OPTION_BLOCK m_suboptions;
 
         std::string m_description;
         OPTION_BLOCK m_suboptions;
 


@@ -198,6 +209,137 @@ class CONFIG_ACTION : public ACTION
         void ParseHostAndPort(const std::string & hostAndPort);
 };
 
         void ParseHostAndPort(const std::string & hostAndPort);
 };
 

+class COMMAND_FUNCTOR
+{
+    public:
+        virtual ~COMMAND_FUNCTOR() {}
+        virtual bool operator()(const SGCONF::CONFIG & config,
+                                const std::string & arg,
+                                const std::map<std::string, std::string> & options) = 0;
+        virtual COMMAND_FUNCTOR * Clone() = 0;
+};
+
+class COMMAND
+{
+    public:
+        COMMAND(COMMAND_FUNCTOR * funPtr,
+                const std::string & arg,
+                const std::map<std::string, std::string> & options)
+            : m_funPtr(funPtr->Clone()),
+              m_arg(arg),
+              m_options(options)
+        {}
+        COMMAND(const COMMAND & rhs)
+            : m_funPtr(rhs.m_funPtr->Clone()),
+              m_arg(rhs.m_arg),
+              m_options(rhs.m_options)
+        {}
+        ~COMMAND()
+        {
+            delete m_funPtr;
+        }
+        bool Execute(const SGCONF::CONFIG & config) const
+        {
+            return (*m_funPtr)(config, m_arg, m_options);
+        }
+
+    private:
+        COMMAND_FUNCTOR * m_funPtr;
+        std::string m_arg;
+        std::map<std::string, std::string> m_options;
+};
+
+class COMMANDS
+{
+    public:
+        void Add(COMMAND_FUNCTOR * 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 COMMAND_ACTION : public ACTION
+{
+    public:
+        COMMAND_ACTION(COMMANDS & commands,
+                       const std::string & paramDescription,
+                       bool needArgument,
+                       const OPTION_BLOCK& suboptions,
+                       COMMAND_FUNCTOR* funPtr)
+            : m_commands(commands),
+              m_description(paramDescription),
+              m_argument(needArgument ? "1" : ""), // Hack
+              m_suboptions(suboptions),
+              m_funPtr(funPtr)
+        {}
+        COMMAND_ACTION(COMMANDS & commands,
+                       const std::string & paramDescription,
+                       bool needArgument,
+                       COMMAND_FUNCTOR* funPtr)
+            : m_commands(commands),
+              m_description(paramDescription),
+              m_argument(needArgument ? "1" : ""), // Hack
+              m_funPtr(funPtr)
+        {}
+        COMMAND_ACTION(const COMMAND_ACTION& rhs)
+            : m_commands(rhs.m_commands),
+              m_description(rhs.m_description),
+              m_argument(rhs.m_argument),
+              m_suboptions(rhs.m_suboptions),
+              m_params(rhs.m_params),
+              m_funPtr(rhs.m_funPtr->Clone())
+        {
+        }
+
+        ~COMMAND_ACTION()
+        {
+            delete m_funPtr;
+        }
+
+        virtual ACTION * Clone() const { return new COMMAND_ACTION(*this); }
+
+        virtual std::string ParamDescription() const { return m_description; }
+        virtual std::string DefaultDescription() const { return ""; }
+        virtual OPTION_BLOCK & Suboptions() { return m_suboptions; }
+        virtual PARSER_STATE Parse(int argc, char ** argv)
+        {
+        PARSER_STATE state(false, argc, argv);
+        if (!m_argument.empty())
+            {
+            if (argc == 0 ||
+                argv == NULL ||
+                *argv == NULL)
+                throw ERROR("Missing argument.");
+            m_argument = *argv;
+            --state.argc;
+            ++state.argv;
+            }
+        m_suboptions.Parse(state.argc, state.argv);
+        m_commands.Add(m_funPtr, m_argument, m_params);
+        return state;
+        }
+
+    private:
+        COMMANDS & m_commands;
+        std::string m_description;
+        std::string m_argument;
+        OPTION_BLOCK m_suboptions;
+        std::map<std::string, std::string> m_params;
+        COMMAND_FUNCTOR* m_funPtr;
+};
+

 PARSER_STATE CONFIG_ACTION::Parse(int argc, char ** argv)
 {
 if (argc == 0 ||
 PARSER_STATE CONFIG_ACTION::Parse(int argc, char ** argv)
 {
 if (argc == 0 ||


@@ -249,12 +391,37 @@ else
 }
 
 inline
 }
 
 inline

-CONFIG_ACTION * MakeParamAction(CONFIG & config,
+CONFIG_ACTION * MakeParamAction(SGCONF::CONFIG & config,

                                 const std::string & paramDescription)
 {
 return new CONFIG_ACTION(config, paramDescription);
 }
 
                                 const std::string & paramDescription)
 {
 return new CONFIG_ACTION(config, paramDescription);
 }
 

+inline
+ACTION * MakeCommandAction(COMMANDS & commands,
+                           const std::string & paramDescription,
+                           bool needArgument,
+                           COMMAND_FUNCTOR * funPtr)
+{
+return new COMMAND_ACTION(commands, paramDescription, needArgument, funPtr);
+}
+
+class RAW_XML_FUNCTOR : public COMMAND_FUNCTOR
+{
+    public:
+        virtual bool operator()(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;
+        }
+        virtual COMMAND_FUNCTOR * Clone() { return new RAW_XML_FUNCTOR(*this); }
+};
+

 } // namespace SGCONF
 
 time_t stgTime;
 } // namespace SGCONF
 
 time_t stgTime;


@@ -1226,6 +1393,7 @@ return ProcessSetUser(req.server.data(), req.port.data(), req.admLogin.data(), r
 int main(int argc, char **argv)
 {
 SGCONF::CONFIG config;
 int main(int argc, char **argv)
 {
 SGCONF::CONFIG config;

+SGCONF::COMMANDS commands;

 
 SGCONF::OPTION_BLOCKS blocks;
 blocks.Add("General options")
 
 SGCONF::OPTION_BLOCKS blocks;
 blocks.Add("General options")


@@ -1240,7 +1408,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("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::MakeConfAction(), "\t\tmake raw XML request")
+      .Add("r", "raw", SGCONF::MakeCommandAction(commands, "<xml>", true, new SGCONF::RAW_XML_FUNCTOR()), "\t\tmake raw XML request");

 /*blocks.Add("Admins management options")
       .Add("get-admins", SGCONF::MakeConfAction())
       .Add("get-admin", SGCONF::MakeConfAction())
 /*blocks.Add("Admins management options")
       .Add("get-admins", SGCONF::MakeConfAction())
       .Add("get-admin", SGCONF::MakeConfAction())


@@ -1295,8 +1463,9 @@ return -1;
 }
 
 std::cerr << "Config: " << config.Serialize() << std::endl;
 }
 
 std::cerr << "Config: " << config.Serialize() << std::endl;

+return commands.Execute(config) ? 0 : -1;

 
 

-return 0;
+/*return 0;

 
 if (argc < 2)
     {
 
 if (argc < 2)
     {


@@ -1327,7 +1496,7 @@ else
     UsageConf();
     exit(PARAMETER_PARSING_ERR_CODE);
     }
     UsageConf();
     exit(PARAMETER_PARSING_ERR_CODE);
     }

-return UNKNOWN_ERR_CODE;
+return UNKNOWN_ERR_CODE;*/

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