Ticket 37. Cycle for added in the TARIFF_DATA_RES & operator() in struct

[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 5b55f318a102117e550b22204531ffd6c9f53bf1..35551c5db1ecf24bd509fe06ad3c4cd1a78e4a1c 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>
 


@@ -65,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),


@@ -97,27 +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)
     {

-    s = i->param;
-    std::transform(s.begin(), s.end(), s.begin(), ToLower());
+    if (i->value.empty())
+        continue;
+    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());


@@ -237,7 +234,7 @@ if (CommitTransaction())
     return -1;
     }
 
     return -1;
     }
 

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

 
 return 0;
 }
 
 return 0;
 }