Fixed problems with connect/disconnect notification.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / parser.h

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.h b/projects/stargazer/plugins/configuration/sgconfig/parser.h
index 60e618cbc35a9a581ec9ee8866af8b9f36f9a040..df3d7155872b56f3a08aaad57e6d750ce6b0853c 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser.h
@@ -11,13 +11,13 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

-#include "resetable.h"
-#include "stg_const.h"
-#include "store.h"
-#include "admins.h"
-#include "admin.h"
-#include "users.h"
-#include "stg_message.h"
+#include "stg/resetable.h"
+#include "stg/const.h"
+#include "stg/store.h"
+#include "stg/admins.h"
+#include "stg/admin.h"
+#include "stg/users.h"
+#include "stg/message.h"

 
 class TARIFFS;
 class SETTINGS;
 
 class TARIFFS;
 class SETTINGS;


@@ -26,14 +26,16 @@ class SETTINGS;
 class BASE_PARSER {
 public:
     BASE_PARSER()
 class BASE_PARSER {
 public:
     BASE_PARSER()

-        : admins(NULL),
+        : strError(),
+          admins(NULL),

           users(NULL),
           tariffs(NULL),
           store(NULL),
           settings(NULL),
           users(NULL),
           tariffs(NULL),
           store(NULL),
           settings(NULL),

-          currAdmin(),
-          depth(0)
-    { }
+          currAdmin(NULL),
+          depth(0),
+          answerList(NULL)
+    {}

     virtual ~BASE_PARSER() {}
     virtual int ParseStart(void *data, const char *el, const char **attr) = 0;
     virtual int ParseEnd(void *data, const char *el) = 0;
     virtual ~BASE_PARSER() {}
     virtual int ParseStart(void *data, const char *el, const char **attr) = 0;
     virtual int ParseEnd(void *data, const char *el) = 0;


@@ -49,7 +51,11 @@ public:
     virtual void SetCurrAdmin(ADMIN & cua) { currAdmin = &cua; }
     virtual std::string & GetStrError() { return strError; }
     virtual void Reset() { answerList->clear(); depth = 0; }
     virtual void SetCurrAdmin(ADMIN & cua) { currAdmin = &cua; }
     virtual std::string & GetStrError() { return strError; }
     virtual void Reset() { answerList->clear(); depth = 0; }

+

 protected:
 protected:

+    BASE_PARSER(const BASE_PARSER & rvalue);
+    BASE_PARSER & operator=(const BASE_PARSER & rvalue);
+

     std::string      strError;
     ADMINS *         admins;
     USERS *          users;
     std::string      strError;
     ADMINS *         admins;
     USERS *          users;


@@ -70,7 +76,7 @@ public:
 //-----------------------------------------------------------------------------
 class PARSER_ADD_ADMIN: public BASE_PARSER {
 public:
 //-----------------------------------------------------------------------------
 class PARSER_ADD_ADMIN: public BASE_PARSER {
 public:

-        PARSER_ADD_ADMIN() : BASE_PARSER() {}
+        PARSER_ADD_ADMIN() : BASE_PARSER(), adminToAdd() {}

     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();


@@ -80,7 +86,7 @@ private:
 //-----------------------------------------------------------------------------
 class PARSER_DEL_ADMIN: public BASE_PARSER {
 public:
 //-----------------------------------------------------------------------------
 class PARSER_DEL_ADMIN: public BASE_PARSER {
 public:

-        PARSER_DEL_ADMIN() : BASE_PARSER() {}
+        PARSER_DEL_ADMIN() : BASE_PARSER(), adminToDel() {}

     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();


@@ -91,7 +97,7 @@ private:
 //-----------------------------------------------------------------------------
 class PARSER_CHG_ADMIN: public BASE_PARSER {
 public:
 //-----------------------------------------------------------------------------
 class PARSER_CHG_ADMIN: public BASE_PARSER {
 public:

-        PARSER_CHG_ADMIN() : BASE_PARSER() {}
+        PARSER_CHG_ADMIN() : BASE_PARSER(), login(), password(), privAsString() {}

     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();


@@ -110,8 +116,8 @@ public:
 //-----------------------------------------------------------------------------
 class PARSER_GET_USER: public BASE_PARSER {
 public:
 //-----------------------------------------------------------------------------
 class PARSER_GET_USER: public BASE_PARSER {
 public:

-        PARSER_GET_USER();
-        ~PARSER_GET_USER(){};
+        PARSER_GET_USER() : BASE_PARSER(), login() {}
+        ~PARSER_GET_USER() {}

     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();


@@ -121,7 +127,7 @@ private:
 //-----------------------------------------------------------------------------
 class PARSER_GET_USERS: public BASE_PARSER {
 public:
 //-----------------------------------------------------------------------------
 class PARSER_GET_USERS: public BASE_PARSER {
 public:

-        PARSER_GET_USERS();
+        PARSER_GET_USERS() : BASE_PARSER(), lastUserUpdateTime(0), lastUpdateFound(false) {}

     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();


@@ -139,7 +145,7 @@ public:
 //-----------------------------------------------------------------------------
 class PARSER_ADD_TARIFF: public BASE_PARSER {
 public:
 //-----------------------------------------------------------------------------
 class PARSER_ADD_TARIFF: public BASE_PARSER {
 public:

-        PARSER_ADD_TARIFF() : BASE_PARSER() {}
+        PARSER_ADD_TARIFF() : BASE_PARSER(), tariffToAdd() {}

     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();


@@ -149,7 +155,7 @@ private:
 //-----------------------------------------------------------------------------
 class PARSER_DEL_TARIFF: public BASE_PARSER {
 public:
 //-----------------------------------------------------------------------------
 class PARSER_DEL_TARIFF: public BASE_PARSER {
 public:

-        PARSER_DEL_TARIFF() : BASE_PARSER() {}
+        PARSER_DEL_TARIFF() : BASE_PARSER(), tariffToDel() {}

     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();


@@ -159,7 +165,7 @@ private:
 //-----------------------------------------------------------------------------
 class PARSER_CHG_TARIFF: public BASE_PARSER {
 public:
 //-----------------------------------------------------------------------------
 class PARSER_CHG_TARIFF: public BASE_PARSER {
 public:

-        PARSER_CHG_TARIFF() : BASE_PARSER() {}
+        PARSER_CHG_TARIFF() : BASE_PARSER(), td() {}

     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();


@@ -174,7 +180,7 @@ private:
 //-----------------------------------------------------------------------------/
 class PARSER_ADD_USER: public BASE_PARSER {
 public:
 //-----------------------------------------------------------------------------/
 class PARSER_ADD_USER: public BASE_PARSER {
 public:

-        PARSER_ADD_USER();
+        PARSER_ADD_USER() : BASE_PARSER(), login() {}

         ~PARSER_ADD_USER() {}
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
         ~PARSER_ADD_USER() {}
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);


@@ -194,6 +200,9 @@ public:
     void CreateAnswer();
     void Reset();
 private:
     void CreateAnswer();
     void Reset();
 private:

+    PARSER_CHG_USER(const PARSER_CHG_USER & rvalue);
+    PARSER_CHG_USER & operator=(const PARSER_CHG_USER & rvalue);
+

     std::string EncChar2String(const char *);
     int AplayChanges();
 
     std::string EncChar2String(const char *);
     int AplayChanges();
 


@@ -209,12 +218,15 @@ private:
 //-----------------------------------------------------------------------------
 class PARSER_DEL_USER: public BASE_PARSER {
 public:
 //-----------------------------------------------------------------------------
 class PARSER_DEL_USER: public BASE_PARSER {
 public:

-        PARSER_DEL_USER() : BASE_PARSER(), res(0) {}
+        PARSER_DEL_USER() : BASE_PARSER(), res(0), u(NULL) {}

     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 
 private:
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 
 private:

+    PARSER_DEL_USER(const PARSER_DEL_USER & rvalue);
+    PARSER_DEL_USER & operator=(const PARSER_DEL_USER & rvalue);
+

     int res;
     USER * u;
 };
     int res;
     USER * u;
 };


@@ -231,11 +243,14 @@ private:
 //-----------------------------------------------------------------------------
 class PARSER_SEND_MESSAGE: public BASE_PARSER {
 public:
 //-----------------------------------------------------------------------------
 class PARSER_SEND_MESSAGE: public BASE_PARSER {
 public:

-        PARSER_SEND_MESSAGE() : BASE_PARSER(), result(0) {}
+        PARSER_SEND_MESSAGE() : BASE_PARSER(), logins(), result(0), msg(), u(NULL) {}

     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 private:
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 private:

+    PARSER_SEND_MESSAGE(const PARSER_SEND_MESSAGE & rvalue);
+    PARSER_SEND_MESSAGE & operator=(const PARSER_SEND_MESSAGE & rvalue);
+

     int ParseLogins(const char * logins);
 
     enum {res_ok, res_params_error, res_unknown};
     int ParseLogins(const char * logins);
 
     enum {res_ok, res_params_error, res_unknown};