#include "stg/admin.h"
#include "tariffs_impl.h"
-using namespace std;
-
//-----------------------------------------------------------------------------
TARIFFS_IMPL::TARIFFS_IMPL(STORE * st)
: TARIFFS(),
tariffs(),
store(st),
WriteServLog(GetStgLogger()),
+ mutex(),
strError(),
noTariff(NO_TARIFF_NAME),
onAddNotifiers(),
//-----------------------------------------------------------------------------
int TARIFFS_IMPL::ReadTariffs()
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
-vector<string> tariffsList;
+std::vector<std::string> tariffsList;
if (store->GetTariffsList(&tariffsList))
{
WriteServLog("Cannot get tariffs list.");
WriteServLog("%s", store->GetStrError().c_str());
}
-int tariffsNum = tariffsList.size();
+Tariffs::size_type tariffsNum = tariffsList.size();
-for (int i = 0; i < tariffsNum; i++)
+for (Tariffs::size_type i = 0; i < tariffsNum; i++)
{
TARIFF_DATA td;
if (store->RestoreTariff(&td, tariffsList[i]))
//-----------------------------------------------------------------------------
size_t TARIFFS_IMPL::Count() const
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
return tariffs.size();
}
//-----------------------------------------------------------------------------
-const TARIFF * TARIFFS_IMPL::FindByName(const string & name) const
+const TARIFF * TARIFFS_IMPL::FindByName(const std::string & name) const
{
if (name == NO_TARIFF_NAME)
return &noTariff;
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-list<TARIFF_IMPL>::const_iterator ti;
+STG_LOCKER lock(&mutex);
+std::list<TARIFF_IMPL>::const_iterator ti;
ti = find(tariffs.begin(), tariffs.end(), TARIFF_IMPL(name));
if (ti != tariffs.end())
if (!priv->tariffChg)
{
- string s = admin->GetLogStr() + " Change tariff \'"
+ std::string s = admin->GetLogStr() + " Change tariff \'"
+ td.tariffConf.name + "\'. Access denied.";
strError = "Access denied.";
WriteServLog(s.c_str());
return -1;
}
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
-list<TARIFF_IMPL>::iterator ti;
+std::list<TARIFF_IMPL>::iterator ti;
ti = find(tariffs.begin(), tariffs.end(), TARIFF_IMPL(td.tariffConf.name));
if (ti == tariffs.end())
if (store->SaveTariff(td, td.tariffConf.name))
{
- string error = "Tariff " + td.tariffConf.name + " writing error. " + store->GetStrError();
+ std::string error = "Tariff " + td.tariffConf.name + " writing error. " + store->GetStrError();
WriteServLog(error.c_str());
return -1;
}
return 0;
}
//-----------------------------------------------------------------------------
-int TARIFFS_IMPL::Del(const string & name, const ADMIN * admin)
+int TARIFFS_IMPL::Del(const std::string & name, const ADMIN * admin)
{
const PRIV * priv = admin->GetPriv();
if (!priv->tariffChg)
{
- string s = admin->GetLogStr() + " Delete tariff \'"
+ std::string s = admin->GetLogStr() + " Delete tariff \'"
+ name + "\'. Access denied.";
strError = "Access denied.";
WriteServLog(s.c_str());
TARIFF_DATA td;
{
- STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+ STG_LOCKER lock(&mutex);
- list<TARIFF_IMPL>::iterator ti;
+ std::list<TARIFF_IMPL>::iterator ti;
ti = find(tariffs.begin(), tariffs.end(), TARIFF_IMPL(name));
if (ti == tariffs.end())
WriteServLog("%s", store->GetStrError().c_str());
return -1;
}
-
+
td = ti->GetTariffData();
tariffs.erase(ti);
return 0;
}
//-----------------------------------------------------------------------------
-int TARIFFS_IMPL::Add(const string & name, const ADMIN * admin)
+int TARIFFS_IMPL::Add(const std::string & name, const ADMIN * admin)
{
const PRIV * priv = admin->GetPriv();
if (!priv->tariffChg)
{
- string s = admin->GetLogStr() + " Add tariff \'"
+ std::string s = admin->GetLogStr() + " Add tariff \'"
+ name + "\'. Access denied.";
strError = "Access denied.";
WriteServLog(s.c_str());
}
{
- STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+ STG_LOCKER lock(&mutex);
- list<TARIFF_IMPL>::iterator ti;
+ std::list<TARIFF_IMPL>::iterator ti;
ti = find(tariffs.begin(), tariffs.end(), TARIFF_IMPL(name));
if (ti != tariffs.end())
return 0;
}
//-----------------------------------------------------------------------------
-void TARIFFS_IMPL::GetTariffsData(std::list<TARIFF_DATA> * tdl)
+void TARIFFS_IMPL::GetTariffsData(std::list<TARIFF_DATA> * tdl) const
{
assert(tdl != NULL && "Tariffs data list is not null");
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
-std::list<TARIFF_IMPL>::const_iterator it = tariffs.begin();
+Tariffs::const_iterator it = tariffs.begin();
for (; it != tariffs.end(); ++it)
{
tdl->push_back(it->GetTariffData());
//-----------------------------------------------------------------------------
void TARIFFS_IMPL::AddNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> * n)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
onAddNotifiers.insert(n);
}
//-----------------------------------------------------------------------------
void TARIFFS_IMPL::DelNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> * n)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
onAddNotifiers.erase(n);
}
//-----------------------------------------------------------------------------
void TARIFFS_IMPL::AddNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * n)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
onDelNotifiers.insert(n);
}
//-----------------------------------------------------------------------------
void TARIFFS_IMPL::DelNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * n)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
onDelNotifiers.erase(n);
}
//-----------------------------------------------------------------------------