Ticket 12. In the ReadUsers() method: the error variable added; return -1 removed

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

diff --git a/stglibs/srvconf.lib/parsers/get_user.h b/stglibs/srvconf.lib/parsers/get_user.h
index c8c371d767db8cf738bf3a6bb376493a61842863..a0e3e3a4a8eaab59ebd8a60d9d0796eaeee133be 100644 (file)
--- a/stglibs/srvconf.lib/parsers/get_user.h
+++ b/stglibs/srvconf.lib/parsers/get_user.h
@@ -22,8 +22,8 @@
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_GET_USER_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_GET_USER_H__
 
-#include "parser.h"
-#include "property_parsers.h"
+#include "base.h"
+#include "property.h"
 
 #include "stg/servconf_types.h"
 
@@ -37,16 +37,19 @@ namespace GET_USER
 class PARSER: public STG::PARSER
 {
 public:
-    PARSER();
+    typedef GET_USER::INFO INFO;
+
+    PARSER(CALLBACK f, void * data, const std::string & encoding);
     virtual ~PARSER();
     int  ParseStart(const char * el, const char ** attr);
     void ParseEnd(const char * el);
-    void SetCallback(CALLBACK f, void * data);
+    void Failure(const std::string & reason) { callback(false, reason, info, data); }
 
 private:
     PROPERTY_PARSERS propertyParsers;
     CALLBACK callback;
     void * data;
+    std::string encoding;
     INFO info;
     int depth;
     bool parsingAnswer;
@@ -54,6 +57,8 @@ private:
 
     void ParseUser(const char * el, const char ** attr);
     void ParseUserParams(const char * el, const char ** attr);
+    void ParseAuthBy(const char * el, const char ** attr);
+    void ParseServices(const char * el, const char ** attr);
 };
 
 } // namespace GET_USER