Ticket 37. The comma added after 'period = ?' in the checking if

[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 f7aef9663a7269a6e358a42309acf9e0dd830450..d86a1f7779402d923b6656d3ec2df0f6e3769f6f 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
@@ -31,6 +31,13 @@
 #include "firebird_store.h"
 #include "stg/ibpp.h"
 
+namespace
+{
+
+const int pt_mega = 1024 * 1024;
+
+}
+
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::GetTariffsList(std::vector<std::string> * tariffsList) const
 {
@@ -143,7 +150,7 @@ try
     int32_t id;
     st->Get(1, id);
     st->Close();
-    if (schemaVersion > 0)
+    if (schemaVersion == 1)
         {
         st->Prepare("update tb_tariffs set \
                 fee = ?, \
@@ -161,17 +168,38 @@ try
         }
     else
         {
-        st->Prepare("update tb_tariffs set \
-                fee = ?, \
-                free = ?, \
-                passive_cost = ?, \
-                traff_type = ? \
-                where pk_tariff = ?");
-        st->Set(1, td.tariffConf.fee);
-        st->Set(2, td.tariffConf.free);
-        st->Set(3, td.tariffConf.passiveCost);
-        st->Set(4, td.tariffConf.traffType);
-        st->Set(5, id);
+        if (schemaVersion > 1)
+            {
+            st->Prepare("update tb_tariffs set \
+                    fee = ?, \
+                    free = ?, \
+                    passive_cost = ?, \
+                    traff_type = ?, \
+                    period = ?, \
+                    change_policy = ? \
+                    where pk_tariff = ?");
+            st->Set(1, td.tariffConf.fee);
+            st->Set(2, td.tariffConf.free);
+            st->Set(3, td.tariffConf.passiveCost);
+            st->Set(4, td.tariffConf.traffType);
+            st->Set(5, TARIFF::PeriodToString(td.tariffConf.period));
+            st->Set(6, TARIFF::ChangePolicyToString(td.tariffConf.changePolicy));
+            st->Set(7, id);
+            }
+        else
+            {
+            st->Prepare("update tb_tariffs set \
+                    fee = ?, \
+                    free = ?, \
+                    passive_cost = ?, \
+                    traff_type = ? \
+                    where pk_tariff = ?");
+            st->Set(1, td.tariffConf.fee);
+            st->Set(2, td.tariffConf.free);
+            st->Set(3, td.tariffConf.passiveCost);
+            st->Set(4, td.tariffConf.traffType);
+            st->Set(5, id);
+            }
         }
     st->Execute();
     st->Close();
@@ -305,8 +333,8 @@ try
     st->Get(7, td->dirPrice[dir].priceNightB);
     td->dirPrice[dir].priceNightB /= 1024*1024;
     st->Get(8, td->dirPrice[dir].threshold);
-    if (std::fabs(td->dirPrice[dir].priceDayA - td->dirPrice[dir].priceNightA) < 1.0e-3 &&
-        std::fabs(td->dirPrice[dir].priceDayB - td->dirPrice[dir].priceNightB) < 1.0e-3)
+    if (std::fabs(td->dirPrice[dir].priceDayA - td->dirPrice[dir].priceNightA) < 1.0e-3 / pt_mega &&
+        std::fabs(td->dirPrice[dir].priceDayB - td->dirPrice[dir].priceNightB) < 1.0e-3 / pt_mega)
         {
         td->dirPrice[dir].singlePrice = true;
         }