Added COMMAND_FUNCTOR and COMMAND_ACTION.

[stg.git] / projects / stargazer / plugins / store / postgresql / postgresql_store.cpp

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
index 073fccab5d92ce84e8a46c5dd6d25e7973e6914b..37ff6dbdda10207f30a81ca520b8cc0234b1e6a0 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -38,23 +38,27 @@
  *
  */
 
  *
  */
 

-#include <string>
-#include <vector>
-#include <algorithm>
-
-#include <libpq-fe.h>
+#include "postgresql_store.h"

 
 #include "stg/module_settings.h"
 #include "stg/plugin_creator.h"
 
 #include "stg/module_settings.h"
 #include "stg/plugin_creator.h"

-#include "postgresql_store_utils.h"
-#include "postgresql_store.h"

 
 

-PLUGIN_CREATOR<POSTGRESQL_STORE> pqStoreeCreator;
+#include <libpq-fe.h>
+
+#include <string>
+#include <vector>
+
+namespace
+{
+PLUGIN_CREATOR<POSTGRESQL_STORE> pgsc;
+}
+
+extern "C" STORE * GetStore();

 
 //-----------------------------------------------------------------------------
 STORE * GetStore()
 {
 
 //-----------------------------------------------------------------------------
 STORE * GetStore()
 {

-return pqStoreeCreator.GetPlugin();
+return pgsc.GetPlugin();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -70,7 +74,8 @@ POSTGRESQL_STORE::POSTGRESQL_STORE()
       mutex(),
       version(0),
       retries(3),
       mutex(),
       version(0),
       retries(3),

-      connection(NULL)
+      connection(NULL),
+      logger(GetPluginLogger(GetStgLogger(), "store_postgresql"))

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


@@ -87,37 +92,25 @@ pthread_mutex_destroy(&mutex);
 int POSTGRESQL_STORE::ParseSettings()
 {
 std::vector<PARAM_VALUE>::iterator i;
 int POSTGRESQL_STORE::ParseSettings()
 {
 std::vector<PARAM_VALUE>::iterator i;

-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;
-    std::transform(s.begin(), s.end(), s.begin(), ToLower());
-    if (s == "server")
-        {
+    std::string param(ToLower(i->param));
+    if (param == "server")

         server = *(i->value.begin());
         server = *(i->value.begin());

-        }
-    if (s == "database")
-        {
+    else if (param == "database")

         database = *(i->value.begin());
         database = *(i->value.begin());

-        }
-    if (s == "user")
-        {
+    else if (param == "user")

         user = *(i->value.begin());
         user = *(i->value.begin());

-        }
-    if (s == "password")
-        {
+    else if (param == "password")

         password = *(i->value.begin());
         password = *(i->value.begin());

-        }
-    if (s == "retries")
-        {
+    else if (param == "retries")

         if (str2x(*(i->value.begin()), retries))
             {
             strError = "Invalid 'retries' value";
             printfd(__FILE__, "POSTGRESQL_STORE::ParseSettings(): '%s'\n", strError.c_str());
             return -1;
             }
         if (str2x(*(i->value.begin()), retries))
             {
             strError = "Invalid 'retries' value";
             printfd(__FILE__, "POSTGRESQL_STORE::ParseSettings(): '%s'\n", strError.c_str());
             return -1;
             }

-        }

     }
 
 clientEncoding = "KOI8";
     }
 
 clientEncoding = "KOI8";


@@ -231,6 +224,8 @@ if (CommitTransaction())
     return -1;
     }
 
     return -1;
     }
 

+logger("POSTGRESQL_STORE: Current DB schema version: %d", version);
+

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------