changet reporting function according reporter's iface

2 files changed, 66 insertions, 34 deletions

diff --git a/lib/MiddleWare/MiddleWare.cpp b/lib/MiddleWare/MiddleWare.cpp
index a9a0f56f..9b53e355 100644
--- a/lib/MiddleWare/MiddleWare.cpp
+++ b/lib/MiddleWare/MiddleWare.cpp
@@ -85,6 +85,33 @@ void CMiddleWare::LoadSettings(const std::string& pPath)
     }
 }
 
+void CMiddleWare::DebugDump2Report(const std::string& pDebugDumpDir, CReporter::report_t& pReport)
+{
+    CDebugDump dd;
+    dd.Open(pDebugDumpDir);
+    dd.LoadText(FILENAME_ARCHITECTURE, pReport.m_sArchitecture);
+    dd.LoadText(FILENAME_KERNEL, pReport.m_sKernel);
+    dd.LoadText(FILENAME_PACKAGE, pReport.m_sPackage);
+    dd.LoadText(FILENAME_EXECUTABLE, pReport.m_sExecutable);
+
+    if (dd.Exist(FILENAME_TEXTDATA1))
+    {
+        dd.LoadText(FILENAME_TEXTDATA1, pReport.m_sTextData1);
+    }
+    if (dd.Exist(FILENAME_TEXTDATA2))
+    {
+        dd.LoadText(FILENAME_TEXTDATA2, pReport.m_sTextData2);
+    }
+    if (dd.Exist(FILENAME_BINARYDATA1))
+    {
+        pReport.m_bBinaryData1 = pDebugDumpDir + "/" + FILENAME_BINARYDATA1;
+    }
+    if (dd.Exist(FILENAME_BINARYDATA2))
+    {
+        pReport.m_bBinaryData2 = pDebugDumpDir + "/" + FILENAME_BINARYDATA2;
+    }
+}
+
 void CMiddleWare::RegisterPlugin(const std::string& pName)
 {
     m_pPluginManager->RegisterPlugin(pName);
@@ -126,7 +153,8 @@ void CMiddleWare::CreateReportApplication(const std::string& pApplication,
 }
 
 
-void CMiddleWare::CreateReport(const std::string& pDebugDumpDir)
+void CMiddleWare::CreateReport(const std::string& pDebugDumpDir,
+                               crash_report_t& pCrashReport)
 {
     CDebugDump dd;
     dd.Open(pDebugDumpDir);
@@ -134,44 +162,22 @@ void CMiddleWare::CreateReport(const std::string& pDebugDumpDir)
     {
         std::string application;
         dd.LoadText(FILENAME_APPLICATION, application);
+        pCrashReport.m_sPlugin2ReportersName = application;
         CreateReportApplication(application, pDebugDumpDir);
     }
     if (dd.Exist(FILENAME_LANGUAGE))
     {
         std::string language;
         dd.LoadText(FILENAME_LANGUAGE, language);
+        pCrashReport.m_sPlugin2ReportersName = language;
         CreateReportLanguage(language, pDebugDumpDir);
     }
+    DebugDump2Report(pDebugDumpDir, pCrashReport.m_Report);
 }
 
-void CMiddleWare::SendReport(const std::string& pDebugDumpDir)
-{
-    std::string pluginName;
-    CDebugDump dd;
-    dd.Open(pDebugDumpDir);
-    if (dd.Exist(FILENAME_APPLICATION))
-    {
-        dd.LoadText(FILENAME_APPLICATION, pluginName);
-    }
-    if (dd.Exist(FILENAME_LANGUAGE))
-    {
-        dd.LoadText(FILENAME_LANGUAGE, pluginName);
-    }
-    if (m_mapPlugin2Reporters.find(pluginName) != m_mapPlugin2Reporters.end())
-    {
-        set_reporters_t::iterator it_r;
-        for (it_r = m_mapPlugin2Reporters[pluginName].begin();
-             it_r != m_mapPlugin2Reporters[pluginName].end();
-             it_r++)
-        {
-            CReporter* reporter = m_pPluginManager->GetReporter(*it_r);
-            reporter->Report(pDebugDumpDir);
-        }
-    }
-}
-
-
-void CMiddleWare::Report(const std::string& pUUID, const std::string& pUID)
+void CMiddleWare::CreateReport(const std::string& pUUID,
+                               const std::string& pUID,
+                               crash_report_t& pCrashReport)
 {
     CDatabase* database = m_pPluginManager->GetDatabase(m_sDatabase);
     database_row_t row;
@@ -183,8 +189,23 @@ void CMiddleWare::Report(const std::string& pUUID, const std::string& pUID)
         throw std::string("CMiddleWare::GetReport(): UUID '"+pUUID+"' is not in database.");
     }
 
-    CreateReport(row.m_sDebugDumpPath);
-    SendReport(row.m_sDebugDumpPath);
+    CreateReport(row.m_sDebugDumpPath, pCrashReport);
+}
+
+void CMiddleWare::Report(const crash_report_t& pCrashReport)
+{
+    std::string plugin2ReportersName = pCrashReport.m_sPlugin2ReportersName;
+    if (m_mapPlugin2Reporters.find(plugin2ReportersName) != m_mapPlugin2Reporters.end())
+    {
+        set_reporters_t::iterator it_r;
+        for (it_r = m_mapPlugin2Reporters[plugin2ReportersName].begin();
+             it_r != m_mapPlugin2Reporters[plugin2ReportersName].end();
+             it_r++)
+        {
+            CReporter* reporter = m_pPluginManager->GetReporter(*it_r);
+            reporter->Report(pCrashReport.m_Report);
+        }
+    }
 }
 
 int CMiddleWare::SaveDebugDump(const std::string& pDebugDumpPath, crash_info_t& pCrashInfo)
diff --git a/lib/MiddleWare/MiddleWare.h b/lib/MiddleWare/MiddleWare.h
index 95c29be8..7164d48b 100644
--- a/lib/MiddleWare/MiddleWare.h
+++ b/lib/MiddleWare/MiddleWare.h
@@ -55,8 +55,8 @@ class CMiddleWare
 
         void LoadSettings(const std::string& pPath);
 
-        void CreateReport(const std::string& pDebugDumpDir);
-        void SendReport(const std::string& pDebugDumpDir);
+        void DebugDump2Report(const std::string& pDebugDumpDir, CReporter::report_t& pReport);
+
     public:
 
         typedef struct SCrashInfo
@@ -69,6 +69,12 @@ class CMiddleWare
             std::string m_sTime;
         } crash_info_t;
 
+        typedef struct SCrashReport
+        {
+            std::string m_sPlugin2ReportersName;
+            CReporter::report_t m_Report;
+        } crash_report_t;
+
         typedef std::vector<crash_info_t> vector_crash_infos_t;
 
         CMiddleWare(const std::string& pPlugisConfDir,
@@ -80,7 +86,12 @@ class CMiddleWare
         void RegisterPlugin(const std::string& pName);
         void UnRegisterPlugin(const std::string& pName);
 
-        void Report(const std::string& pUUID, const std::string& pUID);
+        void CreateReport(const std::string& pDebugDumpDir,
+                          crash_report_t& pReport);
+        void CreateReport(const std::string& pUUID,
+                          const std::string& pUID,
+                          crash_report_t& pReport);
+        void Report(const crash_report_t& pReport);
 
         int SaveDebugDump(const std::string& pDebugDumpPath, crash_info_t& pCrashInfo);
         vector_crash_infos_t GetCrashInfos(const std::string& pUID);