Merge remote-tracking branch 'temp/ticket37' into ticket

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

-#include <string>
-#include <vector>
+#include "postgresql_store.h"

 
 

-#include <libpq-fe.h>
+#include "postgresql_store_utils.h"
+#include "postgresql_store.h"

 
 #include "stg/module_settings.h"
 #include "stg/plugin_creator.h"
 
 #include "stg/module_settings.h"
 #include "stg/plugin_creator.h"

-#include "postgresql_store_utils.h"
-#include "postgresql_store.h"
+
+#include <string>
+#include <vector>
+
+#include <libpq-fe.h>

 
 namespace
 {
 
 namespace
 {


@@ -89,13 +92,12 @@ 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)
     {
     if (i->value.empty())
         continue;
 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {
     if (i->value.empty())
         continue;

-    s = ToLower(i->param);
+    std::string s = ToLower(i->param);

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