Fixed compilation of sgconf_xml.

[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 19e3efec8941797e64a64f181b607f5bb056f47a..80431c0dd1c2f3b441256798b3bea2294568a871 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -40,7 +40,6 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

-#include <algorithm>

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


@@ -49,24 +48,34 @@
 #include "postgresql_store_utils.h"
 #include "postgresql_store.h"
 
 #include "postgresql_store_utils.h"
 #include "postgresql_store.h"
 

-PLUGIN_CREATOR<POSTGRESQL_STORE> pqStoreeCreator;
+namespace
+{
+PLUGIN_CREATOR<POSTGRESQL_STORE> pgsc;
+}
+
+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"),
       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);
 }


@@ -83,12 +92,11 @@ 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;
+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;
-    std::transform(s.begin(), s.end(), s.begin(), ToLower());
+    s = ToLower(i->param);

     if (s == "server")
         {
         server = *(i->value.begin());
     if (s == "server")
         {
         server = *(i->value.begin());


@@ -227,6 +235,8 @@ if (CommitTransaction())
     return -1;
     }
 
     return -1;
     }
 

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

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