Simplify notifiers.

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

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store.cpp b/projects/stargazer/plugins/store/firebird/firebird_store.cpp
index 8e3c9d90f0432bd70c0c716c04a1e37a14677682..c11b442be93e390e37a31fafa9dc1a7eb351fd70 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store.cpp
@@ -28,42 +28,29 @@
 
 #include "firebird_store.h"
 
-#include "stg/ibpp.h"
-#include "stg/plugin_creator.h"
+#include "stg/common.h"
 
 #include <string>
 #include <vector>
-#include <algorithm>
 
-#include <cctype>
-
-namespace
+extern "C" STG::Store* GetStore()
 {
-PLUGIN_CREATOR<FIREBIRD_STORE> frsc;
-}
-
-extern "C" STORE * GetStore();
-//-----------------------------------------------------------------------------
-STORE * GetStore()
-{
-return frsc.GetPlugin();
+    static FIREBIRD_STORE plugin;
+    return &plugin;
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 FIREBIRD_STORE::FIREBIRD_STORE()
     : version("firebird_store v.1.4"),
-      strError(),
       db_server("localhost"),
       db_database("/var/stg/stargazer.fdb"),
       db_user("stg"),
       db_password("123456"),
-      settings(),
-      db(),
-      mutex(),
       til(IBPP::ilConcurrency),
       tlr(IBPP::lrWait),
-      logger(GetPluginLogger(GetStgLogger(), "store_firebird"))
+      schemaVersion(0),
+      logger(STG::PluginLogger::get("store_firebird"))
 {
 pthread_mutex_init(&mutex, NULL);
 }
@@ -75,46 +62,46 @@ db->Disconnect();
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::ParseSettings()
 {
-std::vector<PARAM_VALUE>::iterator i;
+std::vector<STG::ParamValue>::iterator i;
 std::string s;
 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {
-    s = i->param;
-
-    std::transform(s.begin(), s.end(), s.begin(), ::tolower);
+    if (i->value.empty())
+        continue;
+    s = ToLower(i->param);
 
     if (s == "server")
-        db_server = *(i->value.begin());
+        db_server = i->value.front();
 
     if (s == "database")
-        db_database = *(i->value.begin());
+        db_database = i->value.front();
 
     if (s == "user")
-        db_user = *(i->value.begin());
+        db_user = i->value.front();
 
     if (s == "password")
-        db_password = *(i->value.begin());
+        db_password = i->value.front();
 
     // Advanced settings block
 
     if (s == "isolationLevel")
         {
-        if (*(i->value.begin()) == "Concurrency")
+        if (i->value.front() == "Concurrency")
             til = IBPP::ilConcurrency;
-        else if (*(i->value.begin()) == "DirtyRead")
+        else if (i->value.front() == "DirtyRead")
             til = IBPP::ilReadDirty;
-        else if (*(i->value.begin()) == "ReadCommitted")
+        else if (i->value.front() == "ReadCommitted")
             til = IBPP::ilReadCommitted;
-        else if (*(i->value.begin()) == "Consistency")
+        else if (i->value.front() == "Consistency")
             til = IBPP::ilConsistency;
         }
 
     if (s == "lockResolution")
         {
-        if (*(i->value.begin()) == "Wait")
+        if (i->value.front() == "Wait")
             tlr = IBPP::lrWait;
-        else if (*(i->value.begin()) == "NoWait")
+        else if (i->value.front() == "NoWait")
             tlr = IBPP::lrNoWait;
         }
     }
@@ -140,8 +127,6 @@ int FIREBIRD_STORE::CheckVersion()
 IBPP::Transaction tr = IBPP::TransactionFactory(db, IBPP::amRead, til, tlr);
 IBPP::Statement st = IBPP::StatementFactory(db, tr);
 
-string name;
-
 try
     {
     tr->Start();
@@ -157,7 +142,7 @@ try
             st->Get(1, schemaVersion);
         }
     tr->Commit();
-    WriteServLog("FIREBIRD_STORE: Current DB schema version: %d", schemaVersion);
+    logger("FIREBIRD_STORE: Current DB schema version: %d", schemaVersion);
     }
 
 catch (IBPP::Exception & ex)