Rearranged some headers in sgconfig.

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

diff --git a/projects/stargazer/admins_impl.cpp b/projects/stargazer/admins_impl.cpp
index 38d2cec0a26b73c75d500d49daf425a5142cb5fb..08656a49c86882d33e0b353411d68c39647127c6 100644 (file)
--- a/projects/stargazer/admins_impl.cpp
+++ b/projects/stargazer/admins_impl.cpp
@@ -32,31 +32,32 @@
 #include <cassert>
 #include <algorithm>
 
 #include <cassert>
 #include <algorithm>
 

+#include "stg/common.h"

 #include "admins_impl.h"
 #include "admins_impl.h"

-#include "admins.h"
-#include "admin.h"

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

-#include "common.h"

 
 using namespace std;
 
 //-----------------------------------------------------------------------------
 ADMINS_IMPL::ADMINS_IMPL(STORE * st)
 
 using namespace std;
 
 //-----------------------------------------------------------------------------
 ADMINS_IMPL::ADMINS_IMPL(STORE * st)

-    : stg(0xFFFF, "@stargazer", ""),
+    : ADMINS(),
+      stg(0xFFFF, "@stargazer", ""),

       noAdmin(0xFFFF, "NO-ADMIN", ""),
       data(),
       store(st),
       WriteServLog(GetStgLogger()),
       searchDescriptors(),
       noAdmin(0xFFFF, "NO-ADMIN", ""),
       data(),
       store(st),
       WriteServLog(GetStgLogger()),
       searchDescriptors(),

-      handle(0)
+      handle(0),
+      mutex(),
+      strError()

 {
 pthread_mutex_init(&mutex, NULL);
 {
 pthread_mutex_init(&mutex, NULL);

-ReadAdmins();
+Read();

 }
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::Add(const string & login, const ADMIN * admin)
 {
 }
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::Add(const string & login, const ADMIN * admin)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 const PRIV * priv = admin->GetPriv();
 
 if (!priv->adminChg)
 const PRIV * priv = admin->GetPriv();
 
 if (!priv->adminChg)


@@ -72,7 +73,7 @@ admin_iter ai(find(data.begin(), data.end(), adm));
 
 if (ai != data.end())
     {
 
 if (ai != data.end())
     {

-    strError = "Administrator \'" + login + "\' cannot not be added. Administrator alredy exist.";
+    strError = "Administrator \'" + login + "\' cannot not be added. Administrator already exist.";

     WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
 
     return -1;
     WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
 
     return -1;


@@ -95,7 +96,7 @@ return -1;
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::Del(const string & login, const ADMIN * admin)
 {
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::Del(const string & login, const ADMIN * admin)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 ADMIN_IMPL adm(0, login, "");
 const PRIV * priv = admin->GetPriv();
 
 ADMIN_IMPL adm(0, login, "");
 const PRIV * priv = admin->GetPriv();
 


@@ -140,7 +141,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::Change(const ADMIN_CONF & ac, const ADMIN * admin)
 {
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::Change(const ADMIN_CONF & ac, const ADMIN * admin)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 const PRIV * priv = admin->GetPriv();
 
 if (!priv->adminChg)
 const PRIV * priv = admin->GetPriv();
 
 if (!priv->adminChg)


@@ -175,9 +176,9 @@ WriteServLog("%s Administrator \'%s\' changed.",
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int ADMINS_IMPL::ReadAdmins()
+int ADMINS_IMPL::Read()

 {
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 vector<string> adminsList;
 if (store->GetAdminsList(&adminsList) < 0)
     {
 vector<string> adminsList;
 if (store->GetAdminsList(&adminsList) < 0)
     {


@@ -200,25 +201,14 @@ for (unsigned int i = 0; i < adminsList.size(); i++)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-void ADMINS_IMPL::PrintAdmins() const
-{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-const_admin_iter ai(data.begin());
-while (ai != data.end())
-    {
-    ai->Print();
-    ai++;
-    }
-}
-//-----------------------------------------------------------------------------
-bool ADMINS_IMPL::FindAdmin(const string & l, ADMIN ** admin)
+bool ADMINS_IMPL::Find(const string & l, ADMIN ** admin)

 {
 assert(admin != NULL && "Pointer to admin is not null");
 
 {
 assert(admin != NULL && "Pointer to admin is not null");
 

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (data.empty())
     {
 if (data.empty())
     {

-    printfd(__FILE__, "no admin in system!\n");
+    printfd(__FILE__, "No admin in system!\n");

     *admin = &noAdmin;
     return false;
     }
     *admin = &noAdmin;
     return false;
     }


@@ -235,9 +225,9 @@ if (ai != data.end())
 return true;
 }
 //-----------------------------------------------------------------------------
 return true;
 }
 //-----------------------------------------------------------------------------

-bool ADMINS_IMPL::AdminExists(const string & login) const
+bool ADMINS_IMPL::Exists(const string & login) const

 {
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (data.empty())
     {
     printfd(__FILE__, "no admin in system!\n");
 if (data.empty())
     {
     printfd(__FILE__, "no admin in system!\n");


@@ -253,9 +243,9 @@ if (ai != data.end())
 return false;
 }
 //-----------------------------------------------------------------------------
 return false;
 }
 //-----------------------------------------------------------------------------

-bool ADMINS_IMPL::AdminCorrect(const string & login, const std::string & password, ADMIN ** admin)
+bool ADMINS_IMPL::Correct(const string & login, const std::string & password, ADMIN ** admin)

 {
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (data.empty())
     {
     printfd(__FILE__, "no admin in system!\n");
 if (data.empty())
     {
     printfd(__FILE__, "no admin in system!\n");


@@ -282,7 +272,7 @@ return true;
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::OpenSearch() const
 {
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::OpenSearch() const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 handle++;
 searchDescriptors[handle] = data.begin();
 return handle;
 handle++;
 searchDescriptors[handle] = data.begin();
 return handle;


@@ -290,7 +280,7 @@ return handle;
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::SearchNext(int h, ADMIN_CONF * ac) const
 {
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::SearchNext(int h, ADMIN_CONF * ac) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (searchDescriptors.find(h) == searchDescriptors.end())
     {
     WriteServLog("ADMINS. Incorrect search handle.");
 if (searchDescriptors.find(h) == searchDescriptors.end())
     {
     WriteServLog("ADMINS. Incorrect search handle.");


@@ -309,7 +299,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::CloseSearch(int h) const
 {
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::CloseSearch(int h) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (searchDescriptors.find(h) != searchDescriptors.end())
     {
     searchDescriptors.erase(searchDescriptors.find(h));
 if (searchDescriptors.find(h) != searchDescriptors.end())
     {
     searchDescriptors.erase(searchDescriptors.find(h));