Remove extra debug.

[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 c3aecbec4aed6b037bc007cb68c08b6c597ebf37..58b571395cbee6c471bd322da8bd66de3df969f3 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
@@ -26,10 +26,14 @@
  *
  */
 
-#include <cmath>
-
 #include "firebird_store.h"
+
 #include "stg/ibpp.h"
+#include "stg/tariff.h"
+#include "stg/tariff_conf.h"
+#include "stg/common.h"
+
+#include <cmath>
 
 namespace
 {
@@ -46,14 +50,13 @@ STG_LOCKER lock(&mutex);
 IBPP::Transaction tr = IBPP::TransactionFactory(db, IBPP::amRead, til, tlr);
 IBPP::Statement st = IBPP::StatementFactory(db, tr);
 
-std::string name;
-
 try
     {
     tr->Start();
     st->Execute("select name from tb_tariffs");
     while (st->Fetch())
         {
+        std::string name;
         st->Get(1, name);
         tariffsList->push_back(name);
         }
@@ -126,7 +129,7 @@ catch (IBPP::Exception & ex)
 return 0;
 }
 //-----------------------------------------------------------------------------
-int FIREBIRD_STORE::SaveTariff(const TARIFF_DATA & td,
+int FIREBIRD_STORE::SaveTariff(const STG::TariffData & td,
                                const std::string & tariffName) const
 {
 STG_LOCKER lock(&mutex);
@@ -171,26 +174,23 @@ try
     st->Set(2, td.tariffConf.free);
     st->Set(3, td.tariffConf.passiveCost);
     st->Set(4, td.tariffConf.traffType);
-    if (schemaVersion == 0)
-        st->Set(num, id);
 
     if (schemaVersion > 0)
         {
-        st->Set(5, TARIFF::PeriodToString(td.tariffConf.period));
-        if (schemaVersion == 1)
-            st->Set(num + 1, id);
+        st->Set(5, STG::Tariff::toString(td.tariffConf.period));
+        ++num;
         }
 
     if (schemaVersion > 1)
         {
-        st->Set(6, TARIFF::ChangePolicyToString(td.tariffConf.changePolicy));
+        st->Set(6, STG::Tariff::toString(td.tariffConf.changePolicy));
         IBPP::Timestamp policyTimeout;
         time_t2ts(td.tariffConf.changePolicyTimeout, &policyTimeout);
         st->Set(7, policyTimeout);
-        if (schemaVersion == 2)
-            st->Set(num + 3, id);
+        num += 2;
         }
 
+    st->Set(num, id);
     st->Execute();
     st->Close();
 
@@ -264,7 +264,7 @@ catch (IBPP::Exception & ex)
 return 0;
 }
 //-----------------------------------------------------------------------------
-int FIREBIRD_STORE::RestoreTariff(TARIFF_DATA * td,
+int FIREBIRD_STORE::RestoreTariff(STG::TariffData * td,
                                   const std::string & tariffName) const
 {
 STG_LOCKER lock(&mutex);
@@ -293,13 +293,12 @@ try
     st->Get(3, td->tariffConf.fee);
     st->Get(4, td->tariffConf.free);
     st->Get(5, td->tariffConf.passiveCost);
-    //st->Get(6, td->tariffConf.traffType);
-    td->tariffConf.traffType = TARIFF::IntToTraffType(Get<int>(st, 6));
+    td->tariffConf.traffType = STG::Tariff::fromInt(Get<int>(st, 6));
     if (schemaVersion > 0)
-        td->tariffConf.period = TARIFF::StringToPeriod(Get<std::string>(st, 7));
+        td->tariffConf.period = STG::Tariff::parsePeriod(Get<std::string>(st, 7));
     if (schemaVersion > 1)
         {
-        td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(Get<std::string>(st, 8));
+        td->tariffConf.changePolicy = STG::Tariff::parseChangePolicy(Get<std::string>(st, 8));
         td->tariffConf.changePolicyTimeout = ts2time_t(Get<IBPP::Timestamp>(st, 9));
         }
     st->Close();