[Mpuls-commits] r3926 - in base/trunk: . mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-10-07 18:29:21 +0200 (Thu, 07 Oct 2010)
New Revision: 3926

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/evaluate.py
Log:
* mpulsweb/controllers/evaluate.py (get_search_options): Remove
some more options that are not actually used: start_date_field,
end_date_field, sql.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-10-07 16:19:46 UTC (rev 3925)
+++ base/trunk/ChangeLog	2010-10-07 16:29:21 UTC (rev 3926)
@@ -1,5 +1,11 @@
 2010-10-07  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/controllers/evaluate.py (get_search_options): Remove
+	some more options that are not actually used: start_date_field,
+	end_date_field, sql.
+
+2010-10-07  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/lib/validators.py (MyDateConverter.__init__): Add
 	comment about the non-obvious unusual use of super to access the
 	base class __init__ method

Modified: base/trunk/mpulsweb/controllers/evaluate.py
===================================================================
--- base/trunk/mpulsweb/controllers/evaluate.py	2010-10-07 16:19:46 UTC (rev 3925)
+++ base/trunk/mpulsweb/controllers/evaluate.py	2010-10-07 16:29:21 UTC (rev 3926)
@@ -71,15 +71,7 @@
         options['end_date'] = soptions.get('end_date') or \
             g.mpuls_config.get('search', 'default-end-date')
         phase = [int(p) for p in soptions.get('phase')]
-
-        if len(phase) == 1 and -1 in phase:
-            options['start_date_field'] = None
-            options['end_date_field'] = None
-        else:
-            options['start_date_field'] = get_phase_dates(min(phase))[0]
-            options['end_date_field'] = get_phase_dates(max(phase))[1]
         options['phase'] = max(phase) #TODO: Why max?
-        options['sql'] = soptions.get('sql') or None
     else:
         # set default evaluation options.
         options['phase'] = g.mpuls_config.get('evaluations', 'default-phases')