[NY] Simplified SERVCONF interface.

[stg.git] / stglibs / srvconf.lib / include / stg / parser_get_user.h

diff --git a/stglibs/srvconf.lib/include/stg/parser_get_user.h b/stglibs/srvconf.lib/include/stg/parser_get_user.h
index db074af48213e78a2da5558bc3cf5ab9b1ffe179..7f6faaad062749a1a67bde20571ace6f6769f5d9 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/parser_get_user.h
+++ b/stglibs/srvconf.lib/include/stg/parser_get_user.h
@@ -22,37 +22,17 @@
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_GET_USER_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_GET_USER_H__
 
 #ifndef __STG_STGLIBS_SRVCONF_PARSER_GET_USER_H__
 #define __STG_STGLIBS_SRVCONF_PARSER_GET_USER_H__
 

-#include "stg/parser.h"
+#include "parser.h"
+
+#include "property_parsers.h"

 
 #include "stg/os_int.h"
 #include "stg/const.h"
 
 #include <string>
 
 #include "stg/os_int.h"
 #include "stg/const.h"
 
 #include <string>

-#include <map>

 
 #include <ctime>
 
 
 #include <ctime>
 

-class BASE_PROPERTY_PARSER
-{
-    public:
-        virtual ~BASE_PROPERTY_PARSER() {}
-        virtual void Parse(const char ** attr) = 0;
-};
-
-template <typename T>
-class PROPERTY_PARSER : public BASE_PROPERTY_PARSER
-{
-    public:
-        typedef T (* FUNC)(const char **);
-        PROPERTY_PARSER(T & v, FUNC f) : value(v), func(f) {}
-        virtual void Parse(const char ** attr) { value = func(attr); }
-    private:
-        T & value;
-        FUNC func;
-};
-
-typedef std::map<std::string, BASE_PROPERTY_PARSER *> PROPERTY_PARSERS;
-

 class PARSER_GET_USER: public PARSER
 {
 public:
 class PARSER_GET_USER: public PARSER
 {
 public:


@@ -92,7 +72,7 @@ public:
         std::string userData[USERDATA_NUM];
     };
 
         std::string userData[USERDATA_NUM];
     };
 

-    typedef void (* CALLBACK)(const INFO & info, void * data);
+    typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);

 
     PARSER_GET_USER();
     virtual ~PARSER_GET_USER();
 
     PARSER_GET_USER();
     virtual ~PARSER_GET_USER();


@@ -105,6 +85,8 @@ private:
     void * data;
     INFO info;
     int depth;
     void * data;
     INFO info;
     int depth;

+    bool parsingAnswer;
+    std::string error;

 
     void ParseUser(const char *el, const char **attr);
     void ParseUserParams(const char *el, const char **attr);
 
     void ParseUser(const char *el, const char **attr);
     void ParseUserParams(const char *el, const char **attr);