Verbose BLOWFISH_CTX failures.

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

diff --git a/projects/sgconf/xml.cpp b/projects/sgconf/xml.cpp
index 9e1d8f80c39948fffd9a13626f2e303f16c64ba1..93a06e23197926b2967b17af88214bddd793ebe4 100644 (file)
--- a/projects/sgconf/xml.cpp
+++ b/projects/sgconf/xml.cpp
@@ -1,5 +1,16 @@
 #include "xml.h"
 
 #include "xml.h"
 

+#include "api_action.h"
+#include "options.h"
+#include "makeproto.h"
+#include "config.h"
+
+#include "stg/servconf.h"
+
+#include <iostream>
+#include <string>
+#include <map>
+

 #include <expat.h>
 
 namespace
 #include <expat.h>
 
 namespace


@@ -10,7 +21,7 @@ struct ParserState
 size_t level;
 };
 
 size_t level;
 };
 

-std::string Indent(size_t size)
+std::string Indent(size_t level)

 {
 return std::string(level * 4, ' ');
 }
 {
 return std::string(level * 4, ' ');
 }


@@ -34,21 +45,19 @@ void Start(void * data, const char * el, const char ** attr)
 {
 ParserState * state = static_cast<ParserState *>(data);
 if (el != NULL)
 {
 ParserState * state = static_cast<ParserState *>(data);
 if (el != NULL)

-    std::cout << Indent(state->level) << "<" << el << PrintAttrs(attr) << ">\n";
+    std::cout << Indent(state->level) << "<" << el << PrintAttr(attr) << ">\n";

 ++state->level;
 }
 
 void End(void * data, const char * el)
 {
 ParserState * state = static_cast<ParserState *>(data);
 ++state->level;
 }
 
 void End(void * data, const char * el)
 {
 ParserState * state = static_cast<ParserState *>(data);

+--state->level;

 if (el != NULL)
     std::cout << Indent(state->level) << "</" << el << ">\n";
 if (el != NULL)
     std::cout << Indent(state->level) << "</" << el << ">\n";

---state->level;

 }
 
 }
 

-}
-
-void SGCONF::PrintXML(const std::string& xml)
+void PrintXML(const std::string& xml)

 {
 ParserState state = { 0 };
 
 {
 ParserState state = { 0 };
 


@@ -58,9 +67,34 @@ XML_SetElementHandler(parser, Start, End);
 XML_SetUserData(parser, &state);
 
 if (XML_Parse(parser, xml.c_str(), xml.length(), true) == XML_STATUS_ERROR)
 XML_SetUserData(parser, &state);
 
 if (XML_Parse(parser, xml.c_str(), xml.length(), true) == XML_STATUS_ERROR)

-    std::cerr << "XML parse error at line " << XML_GetCurrentLineNumber(sc->parser)
-              << ": '" << XML_ErrorString(XML_GetErrorCode(sc->parser)) << "'"
+    std::cerr << "XML parse error at line " << XML_GetCurrentLineNumber(parser)
+              << ": '" << XML_ErrorString(XML_GetErrorCode(parser)) << "'"

               << std::endl;
 
 XML_ParserFree(parser);
 }
               << std::endl;
 
 XML_ParserFree(parser);
 }

+
+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);
+}
+
+bool RawXMLFunction(const SGCONF::CONFIG & config,
+                    const std::string & arg,
+                    const std::map<std::string, std::string> & /*options*/)
+{
+return makeProto(config).RawXML(arg, RawXMLCallback, NULL) == STG::st_ok;
+}
+
+}
+
+void SGCONF::AppendXMLOptionBlock(COMMANDS & commands, OPTION_BLOCKS & blocks)
+{
+blocks.Add("Raw XML")
+      .Add("r", "raw", SGCONF::MakeAPIAction(commands, "<xml>", RawXMLFunction), "\tmake raw XML request");
+}