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

[stg.git] / projects / stargazer / plugins / store / postgresql / postgresql_store_tariffs.cpp

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp
index c9cb7ccfe79f19968eb646c81b2f57652f16985d..dabc06db5586a9c5232eebef51fd66936f123986 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp
@@ -39,7 +39,7 @@
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::GetTariffsList(std::vector<std::string> * tariffsList) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 if (PQstatus(connection) != CONNECTION_OK)
     {
@@ -95,7 +95,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::AddTariff(const std::string & name) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 if (PQstatus(connection) != CONNECTION_OK)
     {
@@ -158,7 +158,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::DelTariff(const std::string & name) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 if (PQstatus(connection) != CONNECTION_OK)
     {
@@ -222,7 +222,7 @@ return 0;
 int POSTGRESQL_STORE::SaveTariff(const TARIFF_DATA & td,
                                  const std::string & tariffName) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 if (PQstatus(connection) != CONNECTION_OK)
     {
@@ -255,10 +255,6 @@ if (EscapeString(ename))
     return -1;
     }
 
-int32_t id, i;
-double pda, pdb, pna, pnb;
-int threshold;
-
     {
     std::ostringstream query;
     query << "SELECT pk_tariff FROM tb_tariffs WHERE name = '" << ename << "'";
@@ -292,6 +288,8 @@ if (tuples != 1)
     return -1;
     }
 
+int32_t id;
+
     {
     std::stringstream tuple;
     tuple << PQgetvalue(result, 0, 0);
@@ -331,11 +329,12 @@ if (PQresultStatus(result) != PGRES_COMMAND_OK)
 
 PQclear(result);
 
-for(i = 0; i < DIR_NUM; i++)
+for(int i = 0; i < DIR_NUM; i++)
     {
-
-    pda = td.dirPrice[i].priceDayA * 1024 * 1024;
-    pdb = td.dirPrice[i].priceDayB * 1024 * 1024;
+    double pda = td.dirPrice[i].priceDayA * 1024 * 1024;
+    double pdb = td.dirPrice[i].priceDayB * 1024 * 1024;
+    double pna = 0;
+    double pnb = 0;
 
     if (td.dirPrice[i].singlePrice)
         {
@@ -348,6 +347,7 @@ for(i = 0; i < DIR_NUM; i++)
         pnb = td.dirPrice[i].priceNightB * 1024 * 1024;
         }
 
+    int threshold = 0;
     if (td.dirPrice[i].noDiscount)
         {
         threshold = 0xffFFffFF;
@@ -403,7 +403,7 @@ return 0;
 int POSTGRESQL_STORE::RestoreTariff(TARIFF_DATA * td,
                                   const std::string & tariffName) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 if (PQstatus(connection) != CONNECTION_OK)
     {