Merge branch 'master' of git://git.fedorahosted.org/git/crash-catcher

1 files changed, 8 insertions, 33 deletions

diff --git a/lib/MiddleWare/Database.h b/lib/MiddleWare/Database.h
index 45d995d..15b20a9 100644
--- a/lib/MiddleWare/Database.h
+++ b/lib/MiddleWare/Database.h
@@ -30,39 +30,24 @@
 /*
  * Table
  * =====
- * UUID | DebugDumpPath | Architecture | Kernel | ProgramPath | Package |
- * UID | Time | Count | Reported | BackTrace | TextData1
+ * UUID | UID| DebugDumpPath | Count | Reported
  *
- * in the future we can add another TextData if we need it
+ * primary key (UUID, UID)
  */
 
 #define DATABASE_COLUMN_UUID            "UUID"
-#define DATABASE_COLUMN_DEBUG_DUMP_PATH "DebugDumpPath"
-#define DATABASE_COLUMN_ARCHITECTURE    "Architecture"
-#define DATABASE_COLUMN_KERNEL          "Kernel"
-#define DATABASE_COLUMN_EXECUTABLE      "Executable"
-#define DATABASE_COLUMN_PACKAGE         "Package"
 #define DATABASE_COLUMN_UID             "UID"
-#define DATABASE_COLUMN_TIME            "Time"
+#define DATABASE_COLUMN_DEBUG_DUMP_PATH "DebugDumpPath"
 #define DATABASE_COLUMN_COUNT           "Count"
 #define DATABASE_COLUMN_REPORTED        "Reported"
-#define DATABASE_COLUMN_BACKTRACE       "BackTrace"
-#define DATABASE_COLUMN_TEXTDATA1       "TextData1"
 
 typedef struct SDatabaseRow
 {
     std::string m_sUUID;
-    std::string m_sDebugDumpPath;
-    std::string m_sArchitecture;
-    std::string m_sKernel;
-    std::string m_sExecutable;
-    std::string m_sPackage;
     std::string m_sUID;
-    std::string m_sTime;
+    std::string m_sDebugDumpPath;
     std::string m_sCount;
     std::string m_sReported;
-    std::string m_sBackTrace;
-    std::string m_sTextData1;
 } database_row_t;
 
 // <column_name, <array of values in all selected rows> >
@@ -76,24 +61,14 @@ class CDatabase : public CPlugin
         virtual void Connect() = 0;
         virtual void DisConnect() = 0;
         virtual void Insert(const std::string& pUUID,
-                            const std::string& pDebugDumpPath,
-                            const std::string& pArch,
-                            const std::string& pKernel,
-                            const std::string& pExecutable,
-                            const std::string& pPackage,
                             const std::string& pUID,
-                            const std::string& pTime) = 0;
-
-        virtual void InsertBackTrace(const std::string& pUUID,
-                                     const std::string& pBackTrace) = 0;
-
-        virtual void InsertTextData1(const std::string& pUUID,
-                                     const std::string& pData) = 0;
+                            const std::string& pDebugDumpPath) = 0;
 
-        virtual void Delete(const std::string& pUUID) = 0;
+        virtual void Delete(const std::string& pUUID, const std::string& pUID) = 0;
 
+        virtual void SetReported(const std::string& pUUID, const std::string& pUID) = 0;
         virtual const vector_database_rows_t GetUIDData(const std::string& pUID) = 0;
-        virtual const database_row_t GetUUIDData(const std::string& pUUID) = 0;
+        virtual const database_row_t GetUUIDData(const std::string& pUUID, const std::string& pUID) = 0;
 };
 
 #endif /* DATABASE_H_ */