prewikka/master: Fixes aggregated/delete information for non aggregated event

commit 9b3ccc5ef110b4d7c91869c556f1cf775289cb94
Author: Yoann Vandoorselaere <[email protected]>
Date:   Wed Jan 6 14:55:29 2010 +0100

    Fixes aggregated/delete information for non aggregated event
    
    This provide a precise deletion scheme for single event suppression,
    and restore analyzer_time information.


========================================

 prewikka/views/alertlisting.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

========================================

diff --git a/prewikka/views/alertlisting.py b/prewikka/views/alertlisting.py
index bc3425b..a2e2eea 100644
--- a/prewikka/views/alertlisting.py
+++ b/prewikka/views/alertlisting.py
@@ -707,6 +707,8 @@ class ListedAlert(ListedMessage):
 
     def setMessage(self, message, ident):
         self["infos"] = [ { } ]
+        self["aggregated"] = False
+        self["delete"] = ident
 
         self.addSensor(message)
         self._setMessageTime(message)
@@ -1196,7 +1198,9 @@ class AlertListing(MessageListing, view.View):
 
             self.dataset["messages"].append(message)
             message.setTime(time_min, time_max)
-            message.setCriteriaForDeletion(delete_criteria)
+
+            if not message.has_key("delete"):
+                message.setCriteriaForDeletion(delete_criteria)
 
         return total_results
 
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-ids.org/mailman/listinfo/prelude-cvslog