prewikka/master: Coding style improvement.

commit f36828fe0cd0c4504e55dbb87cc6e6d54e59e93e
Author: Yoann Vandoorselaere <[email protected]>
Date:   Tue May 19 12:04:54 2009 +0200

    Coding style improvement.


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

 prewikka/views/alertlisting.py |   51 +++++++++++++++++++--------------------
 1 files changed, 25 insertions(+), 26 deletions(-)

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

diff --git a/prewikka/views/alertlisting.py b/prewikka/views/alertlisting.py
index b0d72c6..f6f6801 100644
--- a/prewikka/views/alertlisting.py
+++ b/prewikka/views/alertlisting.py
@@ -784,40 +784,39 @@ class AlertListing(MessageListing, view.View):
         self._applyOptionalEnumFilter(criteria, "classification", "alert.assessment.impact.type",
                                       ["other", "admin", "dos", "file", "recon", "user"])
 
+    def _filterTupleToString(self, (object, operator, value)):
+        return "%s %s '%s'" % (object, operator, utils.escape_criteria(value))
 
     def _applyFiltersForCategory(self, criteria, type):
-        def get_string((object, operator, value)):
-            return "%s %s '%s'" % (object, operator, utils.escape_criteria(value))
-
-        if self.parameters[type]:
+        if not self.parameters[type]:
+            self.dataset[type] = [ ("", "", "") ]
+            self.dataset["%s_filtered" % type] = False
+            return
 
-            # If one object is specified more than one time, and since this object
-            # can not have two different value, we want to apply an OR operator.
-            #
-            # We apply an AND operator between the different objects.
+        # If one object is specified more than one time, and since this object
+        # can not have two different value, we want to apply an OR operator.
+        #
+        # We apply an AND operator between the different objects.
 
-            merge = { }
-            for obj in self.parameters[type]:
-                if merge.has_key(obj[0]):
-                    merge[obj[0]] += [ obj ]
-                else:
-                    merge[obj[0]] =  [ obj ]
+        merge = { }
+        for obj in self.parameters[type]:
+            if merge.has_key(obj[0]):
+                merge[obj[0]] += [ obj ]
+            else:
+                merge[obj[0]] =  [ obj ]
 
-            newcrit = ""
-            for key in iter(merge):
-                if len(newcrit) > 0:
-                    newcrit += " && "
+        newcrit = ""
+        for key in iter(merge):
+            if len(newcrit) > 0:
+                newcrit += " && "
 
-                newcrit += "(" + " || ".join(map(get_string, merge[key])) + ")"
+            newcrit += "(" + " || ".join(map(self._filterTupleToString, merge[key])) + ")"
 
-            if newcrit:
-                criteria.append(newcrit)
+        if newcrit:
+            criteria.append(newcrit)
 
-            self.dataset[type] = [ (path.replace("(0)", "").replace("(-1)", ""), operator, value) for path, operator, value in self.parameters[type] ]
-            self.dataset["%s_filtered" % type] = True
-        else:
-            self.dataset[type] = [ ("", "", "") ]
-            self.dataset["%s_filtered" % type] = False
+        self.dataset[type] = [ (path.replace("(0)", "").replace("(-1)", ""), operator, value) for path, operator, value in self.parameters[type] ]
+        self.dataset["%s_filtered" % type] = True
 
     def _applyFilters(self, criteria):
         self._applyFiltersForCategory(criteria, "classification")
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-ids.org/mailman/listinfo/prelude-cvslog