try to add action plugin, not complete commit

2 files changed, 9 insertions, 13 deletions

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;