Show more information abot XML parsing error.

[stg.git] / stglibs / srvconf.lib / parsers / resetable_utils.h

diff --git a/stglibs/srvconf.lib/parsers/resetable_utils.h b/stglibs/srvconf.lib/parsers/resetable_utils.h
index ed1cd305112db475e282c3fb928e17c8de56fd74..088cb327e0ac22cfff35722ffe4f2cee39b4cc5b 100644 (file)
--- a/stglibs/srvconf.lib/parsers/resetable_utils.h
+++ b/stglibs/srvconf.lib/parsers/resetable_utils.h
@@ -22,6 +22,7 @@
 #define __STG_STGLIBS_SRVCONF_RESETABLE_UTILS_H__
 
 #include "stg/resetable.h"
 #define __STG_STGLIBS_SRVCONF_RESETABLE_UTILS_H__
 
 #include "stg/resetable.h"

+#include "stg/common.h"

 
 #include <string>
 #include <ostream>
 
 #include <string>
 #include <ostream>


@@ -30,6 +31,7 @@ namespace STG
 {
 
 template <typename T>
 {
 
 template <typename T>

+inline

 void appendResetable(std::ostream & stream, const std::string & name, const T & value)
 {
 if (!value.empty())
 void appendResetable(std::ostream & stream, const std::string & name, const T & value)
 {
 if (!value.empty())


@@ -37,12 +39,31 @@ if (!value.empty())
 }
 
 template <typename T>
 }
 
 template <typename T>

+inline

 void appendResetable(std::ostream & stream, const std::string & name, size_t suffix, const T & value)
 {
 if (!value.empty())
     stream << "<" << name << suffix << " value=\"" << value.data() << "\"/>";
 }
 
 void appendResetable(std::ostream & stream, const std::string & name, size_t suffix, const T & value)
 {
 if (!value.empty())
     stream << "<" << name << suffix << " value=\"" << value.data() << "\"/>";
 }
 

+inline
+RESETABLE<std::string> MaybeEncode(const RESETABLE<std::string> & value)
+{
+RESETABLE<std::string> res;
+if (!value.empty())
+    res = Encode12str(value.data());
+return res;
+}
+
+inline
+RESETABLE<std::string> MaybeIconv(const RESETABLE<std::string> & value, const std::string & fromEncoding, const std::string & toEncoding)
+{
+RESETABLE<std::string> res;
+if (!value.empty())
+    res = IconvString(value.data(), fromEncoding, toEncoding);
+return res;
+}
+

 } // namespace STG
 
 #endif
 } // namespace STG
 
 #endif