Revert "Merge remote-tracking branch 'origin/master' into ticket37"

[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 5e2d8ae6de9e29aa608686d0cc3351f406355c97..35551c5db1ecf24bd509fe06ad3c4cd1a78e4a1c 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -38,15 +38,15 @@
  *
  */
 
  *
  */
 

-#include "postgresql_store.h"
-
-#include "stg/module_settings.h"
-#include "stg/plugin_creator.h"
+#include <string>
+#include <vector>

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

-#include <string>
-#include <vector>
+#include "stg/module_settings.h"
+#include "stg/plugin_creator.h"
+#include "postgresql_store_utils.h"
+#include "postgresql_store.h"

 
 namespace
 {
 
 namespace
 {


@@ -64,14 +64,11 @@ 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),
       connection(NULL),
       version(0),
       retries(3),
       connection(NULL),


@@ -92,25 +89,38 @@ pthread_mutex_destroy(&mutex);
 int POSTGRESQL_STORE::ParseSettings()
 {
 std::vector<PARAM_VALUE>::iterator i;
 int POSTGRESQL_STORE::ParseSettings()
 {
 std::vector<PARAM_VALUE>::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)
     {

-    std::string param(ToLower(i->param));
-    if (param == "server")
-        server = *(i->value.begin());
-    else if (param == "database")
-        database = *(i->value.begin());
-    else if (param == "user")
-        user = *(i->value.begin());
-    else if (param == "password")
-        password = *(i->value.begin());
-    else if (param == "retries")
-        if (str2x(*(i->value.begin()), retries))
+    if (i->value.empty())
+        continue;
+    s = ToLower(i->param);
+    if (s == "server")
+        {
+        server = i->value.front();
+        }
+    if (s == "database")
+        {
+        database = i->value.front();
+        }
+    if (s == "user")
+        {
+        user = i->value.front();
+        }
+    if (s == "password")
+        {
+        password = i->value.front();
+        }
+    if (s == "retries")
+        {
+        if (str2x(i->value.front(), retries))

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

+        }

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


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

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

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