[Mpuls-commits] r5984 - base/trunk/mpulsweb/lib

[scm-commit at wald.intevation.org]

Author: ludwig
Date: 2012-06-14 15:32:07 +0200 (Thu, 14 Jun 2012)
New Revision: 5984

Modified:
   base/trunk/mpulsweb/lib/app_globals.py
   base/trunk/mpulsweb/lib/search.py
Log:
Issue 3185: Handle match fields for the CaseCountSearch


Modified: base/trunk/mpulsweb/lib/app_globals.py
===================================================================
--- base/trunk/mpulsweb/lib/app_globals.py	2012-06-14 11:51:35 UTC (rev 5983)
+++ base/trunk/mpulsweb/lib/app_globals.py	2012-06-14 13:32:07 UTC (rev 5984)
@@ -193,10 +193,13 @@
         self.case_search = search_module.CaseSearch(
             self.case_factory.get_search_retrieve_fields(),
             self.case_factory.get_search_match_fields())
+        self.casecount_search = search_module.CaseCountSearch(
+            self.case_factory.get_search_match_fields())
         self.eval_search = search_module.EvaluationSearch(
             self.agency_factory.get_search_retrieve_fields(),
             self.agency_factory.get_search_match_fields())
 
+
     def get_instance_factory(self):
         return InstanceFactory(self.formedTree, PostgresDBInterface())
 

Modified: base/trunk/mpulsweb/lib/search.py
===================================================================
--- base/trunk/mpulsweb/lib/search.py	2012-06-14 11:51:35 UTC (rev 5983)
+++ base/trunk/mpulsweb/lib/search.py	2012-06-14 13:32:07 UTC (rev 5984)
@@ -556,9 +556,9 @@
     MULTI_OPTIONS = Search.MULTI_OPTIONS + ('state', 'phase')
 
 
-    def __init__(self):
+    def __init__(self, match_fields):
         Search.__init__(self)
-        self.match_fields =  []
+        self.match_fields = match_fields
 
     def _build_sql(self, options):
         sql_fields = {}