Ticket 12. The 'stopOnError(rval.stopOnError)' property added in the SETTINGS_IMPL()

[stg.git] / stglibs / srvconf.lib / parsers / get_admin.cpp

diff --git a/stglibs/srvconf.lib/parsers/get_admin.cpp b/stglibs/srvconf.lib/parsers/get_admin.cpp
index 809280b74b6da0936a8e4d92223c7461c428e653..29e35ba7e4f3c891ac9f455cde70ea3dd8385842 100644 (file)
--- a/stglibs/srvconf.lib/parsers/get_admin.cpp
+++ b/stglibs/srvconf.lib/parsers/get_admin.cpp
@@ -45,9 +45,10 @@ return true;
 
 } // namespace STG
 
 
 } // namespace STG
 

-GET_ADMIN::PARSER::PARSER(CALLBACK f, void * d)
+GET_ADMIN::PARSER::PARSER(CALLBACK f, void * d, const std::string & e)

     : callback(f),
       data(d),
     : callback(f),
       data(d),

+      encoding(e),

       depth(0),
       parsingAnswer(false)
 {
       depth(0),
       parsingAnswer(false)
 {


@@ -104,9 +105,9 @@ if (strcasecmp(el, "admin") == 0)
             {
             parsingAnswer = true;
             for (const char ** pos = attr; *pos != NULL; pos = pos + 2)
             {
             parsingAnswer = true;
             for (const char ** pos = attr; *pos != NULL; pos = pos + 2)

-                if (!TryParse(propertyParsers, ToLower(*pos), pos, *pos))
+                if (!TryParse(propertyParsers, ToLower(*pos), pos, encoding, *pos))

                     {
                     {

-                    error = "Invalid parameter.";
+                    error = std::string("Invalid parameter '") + *pos + "'.";

                     break;
                     }
             }
                     break;
                     }
             }