Merge remote-tracking branch 'github/master'

[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 8bddf9ca6c329537f614a02ae44d2c098b5b9468..fc588fcc4a5ebe6edb9926ae1bfeba955de2b686 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store.cpp
@@ -26,42 +26,32 @@
  *
  */
 
  *
  */
 

-#include <string>
-#include <vector>
-#include <algorithm>
-
-#include "stg/ibpp.h"
-#include "stg/plugin_creator.h"
-#include "stg/logger.h"

 #include "firebird_store.h"
 
 #include "firebird_store.h"
 

-using namespace std;
+#include "stg/common.h"

 
 

-PLUGIN_CREATOR<FIREBIRD_STORE> frsc;
-//-----------------------------------------------------------------------------
-STORE * GetStore()
+#include <string>
+#include <vector>
+
+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),

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

 {
 {

-pthread_mutex_init(&mutex, NULL);

 }
 //-----------------------------------------------------------------------------
 FIREBIRD_STORE::~FIREBIRD_STORE()
 }
 //-----------------------------------------------------------------------------
 FIREBIRD_STORE::~FIREBIRD_STORE()


@@ -71,61 +61,47 @@ db->Disconnect();
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::ParseSettings()
 {
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::ParseSettings()
 {

-vector<PARAM_VALUE>::iterator i;
-string s;
+std::vector<STG::ParamValue>::iterator i;
+std::string s;

 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {
 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {

-    s = i->param;
-    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;
             til = IBPP::ilConsistency;

-            }

         }
         }

+

     if (s == "lockResolution")
         {
     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;

-            }

         }
     }
 
         }
     }
 


@@ -150,8 +126,6 @@ int FIREBIRD_STORE::CheckVersion()
 IBPP::Transaction tr = IBPP::TransactionFactory(db, IBPP::amRead, til, tlr);
 IBPP::Statement st = IBPP::StatementFactory(db, tr);
 
 IBPP::Transaction tr = IBPP::TransactionFactory(db, IBPP::amRead, til, tlr);
 IBPP::Statement st = IBPP::StatementFactory(db, tr);
 

-string name;
-

 try
     {
     tr->Start();
 try
     {
     tr->Start();


@@ -167,7 +141,7 @@ try
             st->Get(1, schemaVersion);
         }
     tr->Commit();
             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)
     }
 
 catch (IBPP::Exception & ex)