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 3c4f32adf50b1560d2d8fa14427e6f479e4da087..c11b442be93e390e37a31fafa9dc1a7eb351fd70 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store.cpp
@@ -28,43 +28,29 @@
 
 #include "firebird_store.h"
 
 
 #include "firebird_store.h"
 

-#include "stg/ibpp.h"
-#include "stg/plugin_creator.h"
+#include "stg/common.h"

 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

-#include <algorithm>

 
 

-#include <cctype>
-
-namespace
-{
-PLUGIN_CREATOR<FIREBIRD_STORE> frsc;
-}
-
-extern "C" STORE * GetStore();
-//-----------------------------------------------------------------------------
-STORE * GetStore()
+extern "C" STG::Store* GetStore()

 {
 {

-return frsc.GetPlugin();
+    static FIREBIRD_STORE plugin;
+    return &plugin;

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 FIREBIRD_STORE::FIREBIRD_STORE()
     : version("firebird_store v.1.4"),
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 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"),
       db_server("localhost"),
       db_database("/var/stg/stargazer.fdb"),
       db_user("stg"),
       db_password("123456"),

-      settings(),
-      db(),
-      mutex(),

       til(IBPP::ilConcurrency),
       tlr(IBPP::lrWait),
       schemaVersion(0),
       til(IBPP::ilConcurrency),
       tlr(IBPP::lrWait),
       schemaVersion(0),

-      logger(GetPluginLogger(GetStgLogger(), "store_firebird"))
+      logger(STG::PluginLogger::get("store_firebird"))

 {
 pthread_mutex_init(&mutex, NULL);
 }
 {
 pthread_mutex_init(&mutex, NULL);
 }


@@ -76,46 +62,46 @@ db->Disconnect();
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::ParseSettings()
 {
 //-----------------------------------------------------------------------------
 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)
     {
 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")
 
     if (s == "server")

-        db_server = *(i->value.begin());
+        db_server = i->value.front();

 
     if (s == "database")
 
     if (s == "database")

-        db_database = *(i->value.begin());
+        db_database = i->value.front();

 
     if (s == "user")
 
     if (s == "user")

-        db_user = *(i->value.begin());
+        db_user = i->value.front();

 
     if (s == "password")
 
     if (s == "password")

-        db_password = *(i->value.begin());
+        db_password = i->value.front();

 
     // Advanced settings block
 
     if (s == "isolationLevel")
         {
 
     // Advanced settings block
 
     if (s == "isolationLevel")
         {

-        if (*(i->value.begin()) == "Concurrency")
+        if (i->value.front() == "Concurrency")

             til = IBPP::ilConcurrency;
             til = IBPP::ilConcurrency;

-        else if (*(i->value.begin()) == "DirtyRead")
+        else if (i->value.front() == "DirtyRead")

             til = IBPP::ilReadDirty;
             til = IBPP::ilReadDirty;

-        else if (*(i->value.begin()) == "ReadCommitted")
+        else if (i->value.front() == "ReadCommitted")

             til = IBPP::ilReadCommitted;
             til = IBPP::ilReadCommitted;

-        else if (*(i->value.begin()) == "Consistency")
+        else if (i->value.front() == "Consistency")

             til = IBPP::ilConsistency;
         }
 
     if (s == "lockResolution")
         {
             til = IBPP::ilConsistency;
         }
 
     if (s == "lockResolution")
         {

-        if (*(i->value.begin()) == "Wait")
+        if (i->value.front() == "Wait")

             tlr = IBPP::lrWait;
             tlr = IBPP::lrWait;

-        else if (*(i->value.begin()) == "NoWait")
+        else if (i->value.front() == "NoWait")

             tlr = IBPP::lrNoWait;
         }
     }
             tlr = IBPP::lrNoWait;
         }
     }