Verbose test reports on failures.

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

diff --git a/projects/sgconf/corps.cpp b/projects/sgconf/corps.cpp
index 56293efd7e720c6dd3a45375983fba8415ef6b88..2dd0ffff89a9d51820df0c5354096e771fb59300 100644 (file)
--- a/projects/sgconf/corps.cpp
+++ b/projects/sgconf/corps.cpp
@@ -1,6 +1,10 @@
 #include "corps.h"
 
 #include "corps.h"
 

+#include "api_action.h"
+#include "options.h"
+#include "makeproto.h"

 #include "config.h"
 #include "config.h"

+#include "utils.h"

 
 #include "stg/servconf.h"
 #include "stg/servconf_types.h"
 
 #include "stg/servconf.h"
 #include "stg/servconf_types.h"


@@ -8,6 +12,8 @@
 #include "stg/common.h"
 
 #include <iostream>
 #include "stg/common.h"
 
 #include <iostream>

+#include <string>
+#include <map>

 
 namespace
 {
 
 namespace
 {


@@ -19,12 +25,19 @@ if (level == 0)
 return dash ? std::string(level * 4 - 2, ' ') + "- " : std::string(level * 4, ' ');
 }
 
 return dash ? std::string(level * 4 - 2, ' ') + "- " : std::string(level * 4, ' ');
 }
 

-void PrintCorp(const STG::GET_CORP::INFO & info, size_t level = 0)
+void PrintCorp(const STG::GetCorp::Info & info, size_t level = 0)

 {
 std::cout << Indent(level, true) << "name: " << info.name << "\n"
           << Indent(level)       << "cash: " << info.cash << "\n";
 }
 
 {
 std::cout << Indent(level, true) << "name: " << info.name << "\n"
           << Indent(level)       << "cash: " << info.cash << "\n";
 }
 

+std::vector<SGCONF::API_ACTION::PARAM> GetCorpParams()
+{
+std::vector<SGCONF::API_ACTION::PARAM> params;
+params.push_back(SGCONF::API_ACTION::PARAM("cash", "<cash>", "\tcorporation's cash"));
+return params;
+}
+

 void SimpleCallback(bool result,
                     const std::string & reason,
                     void * /*data*/)
 void SimpleCallback(bool result,
                     const std::string & reason,
                     void * /*data*/)


@@ -39,7 +52,7 @@ std::cout << "Success.\n";
 
 void GetCorpsCallback(bool result,
                       const std::string & reason,
 
 void GetCorpsCallback(bool result,
                       const std::string & reason,

-                      const std::vector<STG::GET_CORP::INFO> & info,
+                      const std::vector<STG::GetCorp::Info> & info,

                       void * /*data*/)
 {
 if (!result)
                       void * /*data*/)
 {
 if (!result)


@@ -54,7 +67,7 @@ for (size_t i = 0; i < info.size(); ++i)
 
 void GetCorpCallback(bool result,
                      const std::string & reason,
 
 void GetCorpCallback(bool result,
                      const std::string & reason,

-                     const STG::GET_CORP::INFO & info,
+                     const STG::GetCorp::Info & info,

                      void * /*data*/)
 {
 if (!result)
                      void * /*data*/)
 {
 if (!result)


@@ -65,55 +78,56 @@ if (!result)
 PrintCorp(info);
 }
 
 PrintCorp(info);
 }
 

-} // namespace anonymous
+bool GetCorpsFunction(const SGCONF::CONFIG & config,
+                      const std::string & /*arg*/,
+                      const std::map<std::string, std::string> & /*options*/)
+{
+return makeProto(config).GetCorporations(GetCorpsCallback, NULL) == STG::st_ok;
+}

 
 

-bool SGCONF::GetCorpsFunction(const SGCONF::CONFIG & config,
-                              const std::string & /*arg*/,
-                              const std::map<std::string, std::string> & /*options*/)
+bool GetCorpFunction(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.GetCorporations(GetCorpsCallback, NULL) == STG::st_ok;
+return makeProto(config).GetCorp(arg, GetCorpCallback, NULL) == STG::st_ok;

 }
 
 }
 

-bool SGCONF::GetCorpFunction(const SGCONF::CONFIG & config,
-                             const std::string & arg,
-                             const std::map<std::string, std::string> & /*options*/)
+bool DelCorpFunction(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.GetCorp(arg, GetCorpCallback, NULL) == STG::st_ok;
+return makeProto(config).DelCorp(arg, SimpleCallback, NULL) == STG::st_ok;

 }
 
 }
 

-bool SGCONF::DelCorpFunction(const SGCONF::CONFIG & config,
-                             const std::string & arg,
-                             const std::map<std::string, std::string> & /*options*/)
+bool AddCorpFunction(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.DelCorp(arg, SimpleCallback, NULL) == STG::st_ok;
+STG::CorpConfOpt conf;
+conf.name = arg;
+SGCONF::MaybeSet(options, "cash", conf.cash);
+return makeProto(config).AddCorp(arg, conf, SimpleCallback, NULL) == STG::st_ok;

 }
 
 }
 

-bool SGCONF::AddCorpFunction(const SGCONF::CONFIG & config,
-                             const std::string & arg,
-                             const std::map<std::string, std::string> & /*options*/)
+bool ChgCorpFunction(const SGCONF::CONFIG & config,
+                     const std::string & arg,
+                     const std::map<std::string, std::string> & options)

 {
 {

-// TODO
-std::cerr << "Unimplemented.\n";
-return false;
+STG::CorpConfOpt conf;
+conf.name = arg;
+SGCONF::MaybeSet(options, "cash", conf.cash);
+return makeProto(config).ChgCorp(conf, SimpleCallback, NULL) == STG::st_ok;

 }
 
 }
 

-bool SGCONF::ChgCorpFunction(const SGCONF::CONFIG & config,
-                             const std::string & arg,
-                             const std::map<std::string, std::string> & options)
+} // namespace anonymous
+
+void SGCONF::AppendCorpsOptionBlock(COMMANDS & commands, OPTION_BLOCKS & blocks)

 {
 {

-// TODO
-std::cerr << "Unimplemented.\n";
-return false;
+std::vector<API_ACTION::PARAM> params(GetCorpParams());
+blocks.Add("Corporation management options")
+      .Add("get-corps", SGCONF::MakeAPIAction(commands, GetCorpsFunction), "\tget corporation list")
+      .Add("get-corp", SGCONF::MakeAPIAction(commands, "<name>", GetCorpFunction), "get corporation")
+      .Add("add-corp", SGCONF::MakeAPIAction(commands, "<name>", params, AddCorpFunction), "add corporation")
+      .Add("del-corp", SGCONF::MakeAPIAction(commands, "<name>", DelCorpFunction), "delete corporation")
+      .Add("chg-corp", SGCONF::MakeAPIAction(commands, "<name>", params, ChgCorpFunction), "change corporation");

 }
 }