added new interface frof settings

8 files changed, 22 insertions, 55 deletions

diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index 38f1a2a..7a4fdc3 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -22,7 +22,7 @@
 #include "CCpp.h"
 #include <fstream>
 #include "DebugDump.h"
-#include "Settings.h"
+#include "PluginSettings.h"
 #include <sstream>
 #include <iostream>
 #include <hash_map>
@@ -388,7 +388,7 @@ void CAnalyzerCCpp::DeInit()
 void CAnalyzerCCpp::LoadSettings(const std::string& pPath)
 {
     map_settings_t settings;
-    load_settings(pPath, settings);
+    plugin_load_settings(pPath, settings);
 
     if (settings.find("MemoryMap")!= settings.end())
       {
diff --git a/lib/Plugins/Kerneloops.cpp b/lib/Plugins/Kerneloops.cpp
index cf65c9e..b743a48 100644
--- a/lib/Plugins/Kerneloops.cpp
+++ b/lib/Plugins/Kerneloops.cpp
@@ -27,7 +27,7 @@
 #include "Kerneloops.h"
 #include "KerneloopsSysLog.h"
 #include "DebugDump.h"
-#include "Settings.h"
+#include "PluginSettings.h"
 
 #include <sstream>
 #include <assert.h>
@@ -221,7 +221,7 @@ void CAnalyzerKerneloops::ScanSysLogFile(const char *filename, int issyslog)
 void CAnalyzerKerneloops::LoadSettings(const std::string& pPath)
 {
 	map_settings_t settings;
-	load_settings(pPath, settings);
+	plugin_load_settings(pPath, settings);
 
 	if (settings.find("SysLogFile")!= settings.end())
 	{
diff --git a/lib/Plugins/KerneloopsReporter.cpp b/lib/Plugins/KerneloopsReporter.cpp
index fc0ab97..1bf485c 100644
--- a/lib/Plugins/KerneloopsReporter.cpp
+++ b/lib/Plugins/KerneloopsReporter.cpp
@@ -26,7 +26,7 @@
 
 #include "KerneloopsReporter.h"
 #include "DebugDump.h"
-#include "Settings.h"
+#include "PluginSettings.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -85,7 +85,7 @@ void CKerneloopsReporter::Report(const crash_report_t& pCrashReport)
 void CKerneloopsReporter::LoadSettings(const std::string& pPath)
 {
 	map_settings_t settings;
-	load_settings(pPath, settings);
+	plugin_load_settings(pPath, settings);
 
 	if (settings.find("SubmitURL") != settings.end())
 	{
diff --git a/lib/Plugins/Logger.cpp b/lib/Plugins/Logger.cpp
index 3b48d5e..c17e85e 100644
--- a/lib/Plugins/Logger.cpp
+++ b/lib/Plugins/Logger.cpp
@@ -21,7 +21,7 @@
 
 #include "Logger.h"
 #include <fstream>
-#include "Settings.h"
+#include "PluginSettings.h"
 #include <sstream>
 #include "DebugDump.h"
 
@@ -33,7 +33,7 @@ CLogger::CLogger() :
 void CLogger::LoadSettings(const std::string& pPath)
 {
     map_settings_t settings;
-    load_settings(pPath, settings);
+    plugin_load_settings(pPath, settings);
 
     if (settings.find("LogPath")!= settings.end())
     {
diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp
index 8c0c4a6..62e3d2b 100644
--- a/lib/Plugins/Mailx.cpp
+++ b/lib/Plugins/Mailx.cpp
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <sstream>
 #include "DebugDump.h"
-#include "Settings.h"
+#include "PluginSettings.h"
 
 #define MAILX_COMMAND "/bin/mailx"
 #define MAILX_SUBJECT "\"abrt automated bug report\""
@@ -126,7 +126,7 @@ void CMailx::Report(const crash_report_t& pCrashReport)
 void CMailx::LoadSettings(const std::string& pPath)
 {
     map_settings_t settings;
-    load_settings(pPath, settings);
+    plugin_load_settings(pPath, settings);
 
     if (settings.find("EmailFrom")!= settings.end())
     {
diff --git a/lib/Plugins/Makefile.am b/lib/Plugins/Makefile.am
index 7e02c19..292918e 100644
--- a/lib/Plugins/Makefile.am
+++ b/lib/Plugins/Makefile.am
@@ -12,33 +12,33 @@ pluginsconfdir=$(PLUGINS_CONF_DIR)
 dist_pluginsconf_DATA = CCpp.conf Mailx.conf SQLite3.conf Logger.conf Kerneloops.conf KerneloopsReporter.conf
 
 # CCpp
-libCCpp_la_SOURCES = CCpp.cpp CCpp.h
+libCCpp_la_SOURCES = CCpp.cpp CCpp.h PluginSettings.h
 libCCpp_la_LDFLAGS = -avoid-version
 libCCpp_la_CPPFLAGS = -I$(srcdir)/../MiddleWare  -I$(srcdir)/../Utils -DCCPP_HOOK_PATH=\"${libexecdir}/hookCCpp\"
 
 # Kerneloops
-libKerneloops_la_SOURCES = Kerneloops.cpp Kerneloops.h KerneloopsSysLog.cpp KerneloopsSysLog.h
+libKerneloops_la_SOURCES = Kerneloops.cpp Kerneloops.h KerneloopsSysLog.cpp KerneloopsSysLog.h PluginSettings.h
 libKerneloops_la_LDFLAGS = -avoid-version
 libKerneloops_la_CPPFLAGS = -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" -DCCPP_HOOK_PATH=\"${libexecdir}/hookKerneloopsoops\"
 
 # KerneloopsReporter
-libKerneloopsReporter_la_SOURCES = KerneloopsReporter.cpp KerneloopsReporter.h
+libKerneloopsReporter_la_SOURCES = KerneloopsReporter.cpp KerneloopsReporter.h PluginSettings.h
 libKerneloopsReporter_la_LDFLAGS = -avoid-version
 libKerneloopsReporter_la_LIBADD = $(CURL_LIBS)
 libKerneloopsReporter_la_CPPFLAGS = -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils $(CURL_CFLAGS)
 
 # Mailx
-libMailx_la_SOURCES = Mailx.cpp Mailx.h
+libMailx_la_SOURCES = Mailx.cpp Mailx.h PluginSettings.h
 libMailx_la_LDFLAGS = -avoid-version
 
 # SQLite3
-libSQLite3_la_SOURCES = SQLite3.cpp SQLite3.h
+libSQLite3_la_SOURCES = SQLite3.cpp SQLite3.h PluginSettings.h
 libSQLite3_la_LDFLAGS = -avoid-version
 libSQLite3_la_LIBADD = $(SQLITE3_LIBS)
 libSQLite3_la_CPPFLAGS = -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils $(SQLITE3_CFLAGS)
 
 # Logger
-libLogger_la_SOURCES = Logger.cpp Logger.h
+libLogger_la_SOURCES = Logger.cpp Logger.h PluginSettings.h
 libLogger_la_LDFLAGS = -avoid-version
 
 # RunApp
diff --git a/lib/Plugins/PluginSettings.h b/lib/Plugins/PluginSettings.h
index 31138d0..d331b35 100644
--- a/lib/Plugins/PluginSettings.h
+++ b/lib/Plugins/PluginSettings.h
@@ -1,5 +1,5 @@
 /*
-    Settings.h - header file for settings functions
+    PluginSettings.h - header file for plugin settings functions
 
     Copyright (C) 2009  Zdenek Prikryl (zprikryl@redhat.com)
     Copyright (C) 2009  RedHat inc.
@@ -19,8 +19,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
 
-#ifndef SETTINGSFUNC_H_
-#define SETTINGSFUNC_H_
+#ifndef PLUGINSETTINGSFUNC_H_
+#define PLUGINSETTINGSFUNC_H_
 
 #include <fstream>
 #include <map>
@@ -29,7 +29,7 @@
 typedef std::map<std::string, std::string> map_settings_t;
 typedef std::set<std::string> set_settings_t;
 
-inline void load_settings(const std::string& path, map_settings_t& settings)
+inline void plugin_load_settings(const std::string& path, map_settings_t& settings)
 {
     std::ifstream fIn;
     fIn.open(path.c_str());
@@ -84,37 +84,4 @@ inline void load_settings(const std::string& path, map_settings_t& settings)
     }
 }
 
-inline void save_settings(const std::string& path, const map_settings_t& settings)
-{
-    map_settings_t::const_iterator it;
-    std::ofstream fOut;
-    fOut.open(path.c_str());
-    if (fOut.is_open())
-    {
-        fOut << "# !DO NOT EDIT THIS FILE BY HAND. IT IS GENERATED BY ABRT!" << std::endl;
-        for (it = settings.begin(); it != settings.end(); it++)
-        {
-            fOut << it->first << " = " << it->second << std::endl << std::endl;
-        }
-        fOut.close();
-    }
-    else
-    {
-        throw std::string("save_settings():  Cannot write configuration file '"+path+"'.");
-    }
-}
-
-inline void parse_settings(const std::string& pLine, set_settings_t& settings)
-{
-    std::string::size_type ii_old = 0, ii_new = 0;
-    ii_new = pLine.find(",");
-    while (ii_new != std::string::npos)
-    {
-        settings.insert(pLine.substr(ii_old, ii_new - ii_old));
-        ii_old = ii_new + 1;
-        ii_new = pLine.find(",",ii_old);
-    }
-    settings.insert(pLine.substr(ii_old));
-}
-
 #endif /* SETTINGSFUNC_H_ */
diff --git a/lib/Plugins/SQLite3.cpp b/lib/Plugins/SQLite3.cpp
index f48e71b..9a5c6e0 100644
--- a/lib/Plugins/SQLite3.cpp
+++ b/lib/Plugins/SQLite3.cpp
@@ -24,7 +24,7 @@
 #include "SQLite3.h"
 #include <string>
 #include <iostream>
-#include "Settings.h"
+#include "PluginSettings.h"
 
 
 #define ABRT_TABLE "abrt"
@@ -271,7 +271,7 @@ const database_row_t CSQLite3::GetUUIDData(const std::string& pUUID, const std::
 void CSQLite3::LoadSettings(const std::string& pPath)
 {
     map_settings_t settings;
-    load_settings(pPath, settings);
+    plugin_load_settings(pPath, settings);
 
     if (settings.find("DBPath")!= settings.end())
     {