rlm_stg is now "thread-unsafe".

[stg.git] / projects / stargazer / plugins / store / firebird / firebird_store_tariffs.cpp

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
index 325e7d7f10b48c79978a04f52655f65a4f9d653c..f7aef9663a7269a6e358a42309acf9e0dd830450 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
@@ -34,7 +34,7 @@
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::GetTariffsList(std::vector<std::string> * tariffsList) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 IBPP::Transaction tr = IBPP::TransactionFactory(db, IBPP::amRead, til, tlr);
 IBPP::Statement st = IBPP::StatementFactory(db, tr);
@@ -66,7 +66,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::AddTariff(const std::string & name) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 IBPP::Transaction tr = IBPP::TransactionFactory(db, IBPP::amWrite, til, tlr);
 IBPP::Statement st = IBPP::StatementFactory(db, tr);
@@ -94,7 +94,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::DelTariff(const std::string & name) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 IBPP::Transaction tr = IBPP::TransactionFactory(db, IBPP::amWrite, til, tlr);
 IBPP::Statement st = IBPP::StatementFactory(db, tr);
@@ -122,15 +122,11 @@ return 0;
 int FIREBIRD_STORE::SaveTariff(const TARIFF_DATA & td,
                                const std::string & tariffName) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 IBPP::Transaction tr = IBPP::TransactionFactory(db, IBPP::amWrite, til, tlr);
 IBPP::Statement st = IBPP::StatementFactory(db, tr);
 
-int32_t id, i;
-double pda, pdb, pna, pnb;
-int threshold;
-
 try
     {
     tr->Start();
@@ -144,6 +140,7 @@ try
     printfd(__FILE__, "Tariff '%s' not found in database\n", tariffName.c_str());
     return -1;
     }
+    int32_t id;
     st->Get(1, id);
     st->Close();
     if (schemaVersion > 0)
@@ -182,14 +179,16 @@ try
     IBPP::Time tb;
     IBPP::Time te;
 
-    for(i = 0; i < DIR_NUM; i++)
+    for(int i = 0; i < DIR_NUM; i++)
         {
 
-    tb.SetTime(td.dirPrice[i].hDay, td.dirPrice[i].mDay, 0);
-    te.SetTime(td.dirPrice[i].hNight, td.dirPrice[i].mNight, 0);
+        tb.SetTime(td.dirPrice[i].hDay, td.dirPrice[i].mDay, 0);
+        te.SetTime(td.dirPrice[i].hNight, td.dirPrice[i].mNight, 0);
 
-        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)
             {
@@ -202,6 +201,7 @@ try
             pnb = td.dirPrice[i].priceNightB;
             }
 
+        int threshold = 0;
         if (td.dirPrice[i].noDiscount)
             {
             threshold = 0xffFFffFF;
@@ -211,26 +211,26 @@ try
             threshold = td.dirPrice[i].threshold;
             }
 
-    st->Prepare("update tb_tariffs_params set \
-            price_day_a = ?, \
-            price_day_b = ?, \
-            price_night_a = ?, \
-            price_night_b = ?, \
-            threshold = ?, \
-            time_day_begins = ?, \
-            time_day_ends = ? \
-            where fk_tariff = ? and dir_num = ?");
-    st->Set(1, pda);
-    st->Set(2, pdb);
-    st->Set(3, pna);
-    st->Set(4, pnb);
-    st->Set(5, threshold);
-    st->Set(6, tb);
-    st->Set(7, te);
-    st->Set(8, id);
-    st->Set(9, i);
-    st->Execute();
-    st->Close();
+        st->Prepare("update tb_tariffs_params set \
+                price_day_a = ?, \
+                price_day_b = ?, \
+                price_night_a = ?, \
+                price_night_b = ?, \
+                threshold = ?, \
+                time_day_begins = ?, \
+                time_day_ends = ? \
+                where fk_tariff = ? and dir_num = ?");
+        st->Set(1, pda);
+        st->Set(2, pdb);
+        st->Set(3, pna);
+        st->Set(4, pnb);
+        st->Set(5, threshold);
+        st->Set(6, tb);
+        st->Set(7, te);
+        st->Set(8, id);
+        st->Set(9, i);
+        st->Execute();
+        st->Close();
         }
     tr->Commit();
     }
@@ -249,16 +249,11 @@ return 0;
 int FIREBIRD_STORE::RestoreTariff(TARIFF_DATA * td,
                                   const std::string & tariffName) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 IBPP::Transaction tr = IBPP::TransactionFactory(db, IBPP::amRead, til, tlr);
 IBPP::Statement st = IBPP::StatementFactory(db, tr);
 
-int32_t id;
-int16_t dir;
-int i;
-IBPP::Time tb, te;
-int h, m, s;
 
 td->tariffConf.name = tariffName;
 
@@ -275,22 +270,20 @@ try
         tr->Rollback();
         return -1;
         }
+    int32_t id;
     st->Get(1, id);
     st->Get(3, td->tariffConf.fee);
     st->Get(4, td->tariffConf.free);
     st->Get(5, td->tariffConf.passiveCost);
-    st->Get(6, td->tariffConf.traffType);
+    //st->Get(6, td->tariffConf.traffType);
+    td->tariffConf.traffType = TARIFF::IntToTraffType(Get<int>(st, 6));
     if (schemaVersion > 0)
-        {
-        std::string period;
-        st->Get(7, period);
-        td->tariffConf.period = TARIFF::StringToPeriod(period);
-        }
+        td->tariffConf.period = TARIFF::StringToPeriod(Get<std::string>(st, 7));
     st->Close();
     st->Prepare("select * from tb_tariffs_params where fk_tariff = ?");
     st->Set(1, id);
     st->Execute();
-    i = 0;
+    int i = 0;
     while (st->Fetch())
     {
     i++;
@@ -301,6 +294,7 @@ try
         tr->Rollback();
         return -1;
         }
+    int16_t dir;
     st->Get(3, dir);
     st->Get(4, td->dirPrice[dir].priceDayA);
     td->dirPrice[dir].priceDayA /= 1024*1024;
@@ -329,8 +323,11 @@ try
 
         td->dirPrice[dir].noDiscount = false;
         }
+    IBPP::Time tb;
     st->Get(9, tb);
+    IBPP::Time te;
     st->Get(10, te);
+    int h, m, s;
     tb.GetTime(h, m, s);
     td->dirPrice[dir].hDay = h;
     td->dirPrice[dir].mDay = m;