try to add action plugin, not complete commit

5 files changed, 21 insertions, 21 deletions

diff --git a/lib/MiddleWare/MiddleWare.cpp b/lib/MiddleWare/MiddleWare.cpp
index 109fc3a..a99fb6e 100644
--- a/lib/MiddleWare/MiddleWare.cpp
+++ b/lib/MiddleWare/MiddleWare.cpp
@@ -137,6 +137,7 @@ void CMiddleWare::CreateCrashReport(const std::string& pUUID,
     dd.SaveText(FILENAME_UUID, UUID);
     dd.Close();
 
+    //RunAnalyzerActions(analyzer, row.m_sDebugDumpDir);
     DebugDumpToCrashReport(row.m_sDebugDumpDir, pCrashReport);
 
     crash_file_t file;
@@ -290,6 +291,10 @@ int CMiddleWare::SaveUUIDToDebugDump(const std::string& pDebugDumpDir)
     return 1;
 }
 
+void CMiddleWare::RunAnalyzerActions(const std::string& pAnalyzer, const std::string& pDebugDumpDir)
+{
+}
+
 int CMiddleWare::SaveDebugDumpToDatabase(const std::string& pDebugDumpDir, crash_info_t& pCrashInfo)
 {
     CDatabase* database = m_pPluginManager->GetDatabase(m_sDatabase);
@@ -443,8 +448,7 @@ void CMiddleWare::AddAnalyzerReporter(const std::string& pAnalyzer,
 }
 
 void CMiddleWare::AddAnalyzerAction(const std::string& pAnalyzer,
-                                    const std::string& pAction,
-                                    const vector_strings_t& pArgs)
+                                    const set_actions_t& pActions)
 {
-    m_mapAnalyzerActions[pAnalyzer][pAction] = pArgs;
+    m_mapAnalyzerActions[pAnalyzer] = pActions;
 }
diff --git a/lib/MiddleWare/MiddleWare.h b/lib/MiddleWare/MiddleWare.h
index 2986b7e..7774954 100644
--- a/lib/MiddleWare/MiddleWare.h
+++ b/lib/MiddleWare/MiddleWare.h
@@ -36,8 +36,8 @@ class CMiddleWare
         typedef set_strings_t set_enabled_plugins_t;
         typedef set_strings_t set_reporters_t;
         typedef std::map<std::string, set_reporters_t> map_reporter_associations_t;
-        typedef std::map<std::string, vector_strings_t> map_single_actions_t;
-        typedef std::map<std::string, map_single_actions_t> map_action_associations_t;
+        typedef std::set<pair_string_string_t> set_actions_t;
+        typedef std::map<std::string, set_actions_t> map_action_associations_t;
 
         CPluginManager* m_pPluginManager;
         CRPM m_RPM;
@@ -54,7 +54,7 @@ class CMiddleWare
                                   const std::string& pDebugDumpDir);
         void CreateReport(const std::string& pAnalyzer,
                           const std::string& pDebugDumpDir);
-
+        void RunAnalyzerActions(const std::string& pAnalyzer, const std::string& pDebugDumpDir);
         void DebugDumpToCrashReport(const std::string& pDebugDumpDir,
                                     crash_report_t& pCrashReport);
 
@@ -98,8 +98,7 @@ class CMiddleWare
         void AddAnalyzerReporter(const std::string& pAnalyzer,
                                  const std::string& pReporter);
         void AddAnalyzerAction(const std::string& pAnalyzer,
-                               const std::string& pAction,
-                               const vector_strings_t& pArgs);
+                               const set_actions_t& pActions);
 };
 
 #endif /*MIDDLEWARE_H_*/
diff --git a/lib/MiddleWare/MiddleWareTypes.h b/lib/MiddleWare/MiddleWareTypes.h
index 5f8ee6a..fe37715 100644
--- a/lib/MiddleWare/MiddleWareTypes.h
+++ b/lib/MiddleWare/MiddleWareTypes.h
@@ -7,6 +7,7 @@
 #include <string>
 
 typedef std::vector<std::string> vector_strings_t;
+typedef std::pair<std::string, std::string> pair_string_string_t;
 typedef std::map<std::string, std::string> map_string_string_t;
 typedef std::set<std::string> set_strings_t;
 
diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index 783a694..ea7397f 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -142,8 +142,8 @@ void CCrashWatcher::SetUpMW()
     {
         m_pMW->RegisterPlugin(*it_p);
     }
-    CSettings::map_reporters_t reporters = m_pSettings->GetReporters();
-    CSettings::map_reporters_t::iterator it_pr;
+    CSettings::map_analyzer_reporters_t reporters = m_pSettings->GetReporters();
+    CSettings::map_analyzer_reporters_t::iterator it_pr;
     for (it_pr = reporters.begin(); it_pr != reporters.end(); it_pr++)
     {
         CSettings::set_strings_t::iterator it_r;
@@ -152,15 +152,11 @@ void CCrashWatcher::SetUpMW()
             m_pMW->AddAnalyzerReporter(it_pr->first, *it_r);
         }
     }
-    CSettings::map_actions_t actions = m_pSettings->GetActions();
-    CSettings::map_actions_t::iterator it_pa;
+    CSettings::map_analyzer_actions_t actions = m_pSettings->GetActions();
+    CSettings::map_analyzer_actions_t::iterator it_pa;
     for (it_pa = actions.begin(); it_pa != actions.end(); it_pa++)
     {
-        CSettings::map_single_actions_t::iterator it_sa;
-        for (it_sa = it_pa->second.begin(); it_sa != it_pa->second.end(); it_sa++)
-        {
-            m_pMW->AddAnalyzerAction(it_pa->first, it_sa->first, it_sa->second);
-        }
+        m_pMW->AddAnalyzerAction(it_pa->first, it_pa->second);
     }
 }
 
diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp
index f4304d0..44070d4 100644
--- a/src/Daemon/Settings.cpp
+++ b/src/Daemon/Settings.cpp
@@ -129,7 +129,7 @@ void CSettings::ParseActions()
     for (it = m_mapSettingsActions.begin(); it != m_mapSettingsActions.end(); it++)
     {
         set_strings_t keys = ParseActionKey(it->first);
-        set_single_actions_t singleActions = ParseActionValue(it->second);
+        set_actions_t singleActions = ParseActionValue(it->second);
         set_strings_t::iterator it_keys;
         for (it_keys = keys.begin(); it_keys != keys.end(); it_keys++)
         {
@@ -161,7 +161,7 @@ CSettings::set_actions_t CSettings::ParseActionValue(const std::string& pValue)
         }
         else if ((pValue[ii] == ',' || pValue[ii] == ')') && !is_quote && is_arg)
         {
-            singleActions.isert(make_pair(action, item));
+            //singleActions.isert(make_pair(action, item));
             item = "";
             if (pValue[ii] == ')')
             {
@@ -173,7 +173,7 @@ CSettings::set_actions_t CSettings::ParseActionValue(const std::string& pValue)
         {
         if (item != "")
             {
-                singleActions.isert(make_pair(item, ""));
+                //singleActions.isert(make_pair(item, ""));
                 item = "";
             }
         }
@@ -184,7 +184,7 @@ CSettings::set_actions_t CSettings::ParseActionValue(const std::string& pValue)
     }
     if (item != "")
     {
-    singleActions.insert(make_pair(item, ""));
+    //singleActions.insert(make_pair(item, ""));
     action = "";
     }
     return singleActions;