Ticket 37. The switch case construction for changePolicy

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


@@ -96,26 +93,28 @@ std::string s;
 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {
 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {

+    if (i->value.empty())
+        continue;

     s = ToLower(i->param);
     if (s == "server")
         {
     s = ToLower(i->param);
     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());