Ticket 37. The construction else added to if (tariff != NULL) construction in the

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

diff --git a/projects/stargazer/services_impl.cpp b/projects/stargazer/services_impl.cpp
index 832bf7e9ed54356313beb197670282481f3e67e6..90c23f812acd856a5ec282e0f97f7006eba41af5 100644 (file)
--- a/projects/stargazer/services_impl.cpp
+++ b/projects/stargazer/services_impl.cpp
@@ -43,7 +43,7 @@ Read();
 //-----------------------------------------------------------------------------
 int SERVICES_IMPL::Add(const SERVICE_CONF & service, const ADMIN * admin)
 {
 //-----------------------------------------------------------------------------
 int SERVICES_IMPL::Add(const SERVICE_CONF & service, const ADMIN * admin)
 {

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

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


@@ -54,7 +54,7 @@ if (!priv->serviceChg)
     return -1;
     }
 
     return -1;
     }
 

-srv_iter si(find(data.begin(), data.end(), service));
+iterator si(std::find(data.begin(), data.end(), service));

 
 if (si != data.end())
     {
 
 if (si != data.end())
     {


@@ -81,7 +81,7 @@ return -1;
 //-----------------------------------------------------------------------------
 int SERVICES_IMPL::Del(const std::string & name, const ADMIN * admin)
 {
 //-----------------------------------------------------------------------------
 int SERVICES_IMPL::Del(const std::string & name, const ADMIN * admin)
 {

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

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


@@ -92,7 +92,7 @@ if (!priv->serviceChg)
     return -1;
     }
 
     return -1;
     }
 

-srv_iter si(find(data.begin(), data.end(), SERVICE_CONF(name)));
+iterator si(std::find(data.begin(), data.end(), SERVICE_CONF(name)));

 
 if (si == data.end())
     {
 
 if (si == data.end())
     {


@@ -101,7 +101,7 @@ if (si == data.end())
     return -1;
     }
 
     return -1;
     }
 

-std::map<int, const_srv_iter>::iterator csi;
+std::map<int, const_iterator>::iterator csi;

 csi = searchDescriptors.begin();
 while (csi != searchDescriptors.end())
     {
 csi = searchDescriptors.begin();
 while (csi != searchDescriptors.end())
     {


@@ -125,7 +125,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int SERVICES_IMPL::Change(const SERVICE_CONF & service, const ADMIN * admin)
 {
 //-----------------------------------------------------------------------------
 int SERVICES_IMPL::Change(const SERVICE_CONF & service, const ADMIN * admin)
 {

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

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


@@ -136,7 +136,7 @@ if (!priv->serviceChg)
     return -1;
     }
 
     return -1;
     }
 

-srv_iter si(find(data.begin(), data.end(), service));
+iterator si(std::find(data.begin(), data.end(), service));

 
 if (si == data.end())
     {
 
 if (si == data.end())
     {


@@ -145,7 +145,9 @@ if (si == data.end())
     return -1;
     }
 
     return -1;
     }
 

+printfd(__FILE__, "Old cost = %f, old pay day = %d\n", si->cost, (unsigned)si->payDay);

 *si = service;
 *si = service;

+printfd(__FILE__, "New cost = %f, New pay day = %d\n", si->cost, (unsigned)si->payDay);

 if (store->SaveService(service))
     {
     WriteServLog("Cannot write service %s.", service.name.c_str());
 if (store->SaveService(service))
     {
     WriteServLog("Cannot write service %s.", service.name.c_str());


@@ -161,7 +163,7 @@ return 0;
 //-----------------------------------------------------------------------------
 bool SERVICES_IMPL::Read()
 {
 //-----------------------------------------------------------------------------
 bool SERVICES_IMPL::Read()
 {

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

 std::vector<std::string> servicesList;
 if (store->GetServicesList(&servicesList) < 0)
     {
 std::vector<std::string> servicesList;
 if (store->GetServicesList(&servicesList) < 0)
     {


@@ -184,15 +186,34 @@ for (size_t i = 0; i < servicesList.size(); i++)
 return false;
 }
 //-----------------------------------------------------------------------------
 return false;
 }
 //-----------------------------------------------------------------------------

-bool SERVICES_IMPL::Find(const std::string & name, SERVICE_CONF * service)
+bool SERVICES_IMPL::Find(const std::string & name, SERVICE_CONF * service) const

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

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

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

+    return true;
+
+const_iterator si(std::find(data.begin(), data.end(), SERVICE_CONF(name)));
+
+if (si != data.end())
+    {
+    *service = *si;

     return false;
     return false;

+    }
+
+return true;
+}
+//-----------------------------------------------------------------------------
+bool SERVICES_IMPL::Find(const std::string & name, SERVICE_CONF_RES * service) const
+{
+assert(service != NULL && "Pointer to service is not null");
+
+STG_LOCKER lock(&mutex);
+if (data.empty())
+    return true;

 
 

-srv_iter si(find(data.begin(), data.end(), SERVICE_CONF(name)));
+const_iterator si(std::find(data.begin(), data.end(), SERVICE_CONF(name)));

 
 if (si != data.end())
     {
 
 if (si != data.end())
     {


@@ -205,14 +226,14 @@ return true;
 //-----------------------------------------------------------------------------
 bool SERVICES_IMPL::Exists(const std::string & name) const
 {
 //-----------------------------------------------------------------------------
 bool SERVICES_IMPL::Exists(const std::string & name) const
 {

-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 services in the system!\n");

     return true;
     }
 
     return true;
     }
 

-const_srv_iter si(find(data.begin(), data.end(), SERVICE_CONF(name)));
+const_iterator si(std::find(data.begin(), data.end(), SERVICE_CONF(name)));

 
 if (si != data.end())
     return true;
 
 if (si != data.end())
     return true;


@@ -222,7 +243,7 @@ return false;
 //-----------------------------------------------------------------------------
 int SERVICES_IMPL::OpenSearch() const
 {
 //-----------------------------------------------------------------------------
 int SERVICES_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;


@@ -230,7 +251,7 @@ return handle;
 //-----------------------------------------------------------------------------
 int SERVICES_IMPL::SearchNext(int h, SERVICE_CONF * service) const
 {
 //-----------------------------------------------------------------------------
 int SERVICES_IMPL::SearchNext(int h, SERVICE_CONF * service) const
 {

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

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


@@ -247,7 +268,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int SERVICES_IMPL::CloseSearch(int h) const
 {
 //-----------------------------------------------------------------------------
 int SERVICES_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));