Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / projects / stargazer / admins_impl.h

diff --git a/projects/stargazer/admins_impl.h b/projects/stargazer/admins_impl.h
index b481e25ff120681484e457240054627deec3a54a..7434c44567dd9153e1f0d79c05c03e0d863bed59 100644 (file)
--- a/projects/stargazer/admins_impl.h
+++ b/projects/stargazer/admins_impl.h
@@ -35,51 +35,57 @@
 
 #include <list>
 #include <map>
 
 #include <list>
 #include <map>

+#include <string>

 
 

-#include "admins.h"
-#include "admin.h"
+#include "stg/admins.h"
+#include "stg/admin.h"
+#include "stg/locker.h"
+#include "stg/store.h"
+#include "stg/noncopyable.h"
+#include "stg/logger.h"

 #include "admin_impl.h"
 #include "admin_impl.h"

-#include "stg_locker.h"
-#include "store.h"
-#include "noncopyable.h"

 
 class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {
 public:
     ADMINS_IMPL(STORE * st);
     virtual ~ADMINS_IMPL() {}
 
 
 class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {
 public:
     ADMINS_IMPL(STORE * st);
     virtual ~ADMINS_IMPL() {}
 

-    int           Add(const string & login, const ADMIN * admin);
-    int           Del(const string & login, const ADMIN * admin);
+    int           Add(const std::string & login, const ADMIN * admin);
+    int           Del(const std::string & login, const ADMIN * admin);

     int           Change(const ADMIN_CONF & ac, const ADMIN * admin);
     int           Change(const ADMIN_CONF & ac, const ADMIN * admin);

-    void          PrintAdmins() const;

     const ADMIN * GetSysAdmin() const { return &stg; }
     const ADMIN * GetNoAdmin() const { return &noAdmin; }
     const ADMIN * GetSysAdmin() const { return &stg; }
     const ADMIN * GetNoAdmin() const { return &noAdmin; }

-    bool          FindAdmin(const std::string & l, ADMIN ** admin);
-    bool          AdminExists(const std::string & login) const;
-    bool          AdminCorrect(const std::string & login,
-                               const std::string & password,
-                               ADMIN ** admin);
+    bool          Find(const std::string & l, ADMIN ** admin);
+    bool          Exists(const std::string & login) const;
+    bool          Correct(const std::string & login,
+                          const std::string & password,
+                          ADMIN ** admin);

     const std::string & GetStrError() const { return strError; }
 
     const std::string & GetStrError() const { return strError; }
 

+    size_t        Count() const { return data.size(); }
+

     int OpenSearch() const;
     int SearchNext(int, ADMIN_CONF * ac) const;
     int CloseSearch(int) const;
 
 private:
     int OpenSearch() const;
     int SearchNext(int, ADMIN_CONF * ac) const;
     int CloseSearch(int) const;
 
 private:

-    typedef list<ADMIN_IMPL>::iterator admin_iter;
-    typedef list<ADMIN_IMPL>::const_iterator const_admin_iter;
-
-    int             ReadAdmins();
-
-    ADMIN_IMPL           stg;
-    ADMIN_IMPL           noAdmin;
-    list<ADMIN_IMPL>     data;
-    STORE *              store;
-    STG_LOGGER &         WriteServLog;
-    mutable map<int, const_admin_iter> searchDescriptors;
-    mutable unsigned int handle;
+    ADMINS_IMPL(const ADMINS_IMPL & rvalue);
+    ADMINS_IMPL & operator=(const ADMINS_IMPL & rvalue);
+
+    typedef std::list<ADMIN_IMPL>::iterator admin_iter;
+    typedef std::list<ADMIN_IMPL>::const_iterator const_admin_iter;
+
+    int             Read();
+
+    ADMIN_IMPL              stg;
+    ADMIN_IMPL              noAdmin;
+    std::list<ADMIN_IMPL>   data;
+    STORE *                 store;
+    STG_LOGGER &            WriteServLog;
+    mutable std::map<int, const_admin_iter> searchDescriptors;
+    mutable unsigned int    handle;

     mutable pthread_mutex_t mutex;
     mutable pthread_mutex_t mutex;

-    std::string          strError;
+    std::string             strError;

 };
 
 #endif
 };
 
 #endif