Ticket. MybeSet()function call added for the change-policy-timeout.

[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..a9836911b45ffec8e5b15ee377bde607f5f0ca9e 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -38,39 +38,44 @@
  *
  */
 
  *
  */
 

+#include "postgresql_store.h"
+
+#include "postgresql_store_utils.h"
+#include "postgresql_store.h"
+
+#include "stg/module_settings.h"
+#include "stg/plugin_creator.h"
+

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

-#include <algorithm>

 
 #include <libpq-fe.h>
 
 
 #include <libpq-fe.h>
 

-#include "stg/module_settings.h"
-#include "stg/plugin_creator.h"
-#include "postgresql_store_utils.h"
-#include "postgresql_store.h"
+namespace
+{
+PLUGIN_CREATOR<POSTGRESQL_STORE> pgsc;
+}

 
 

-PLUGIN_CREATOR<POSTGRESQL_STORE> pqStoreeCreator;
+extern "C" STORE * GetStore();

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

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

 }
 
 //-----------------------------------------------------------------------------
 POSTGRESQL_STORE::POSTGRESQL_STORE()
     : versionString("postgresql_store v.1.3"),
 }
 
 //-----------------------------------------------------------------------------
 POSTGRESQL_STORE::POSTGRESQL_STORE()
     : versionString("postgresql_store v.1.3"),

-      strError(),

       server("localhost"),
       database("stargazer"),
       user("stg"),
       password("123456"),
       clientEncoding("KOI8"),
       server("localhost"),
       database("stargazer"),
       user("stg"),
       password("123456"),
       clientEncoding("KOI8"),

-      settings(),
-      mutex(),

       version(0),
       retries(3),
       version(0),
       retries(3),

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

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


@@ -87,31 +92,31 @@ 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 (i->value.empty())
+        continue;
+    std::string s = ToLower(i->param);

     if (s == "server")
         {
     if (s == "server")
         {

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

         }
     if (s == "database")
         {
         }
     if (s == "database")
         {

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

         }
     if (s == "user")
         {
         }
     if (s == "user")
         {

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

         }
     if (s == "password")
         {
         }
     if (s == "password")
         {

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

         }
     if (s == "retries")
         {
         }
     if (s == "retries")
         {

-        if (str2x(*(i->value.begin()), retries))
+        if (str2x(i->value.front(), retries))

             {
             strError = "Invalid 'retries' value";
             printfd(__FILE__, "POSTGRESQL_STORE::ParseSettings(): '%s'\n", strError.c_str());
             {
             strError = "Invalid 'retries' value";
             printfd(__FILE__, "POSTGRESQL_STORE::ParseSettings(): '%s'\n", strError.c_str());


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

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

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