[Mpuls-commits] r807 - in wasko/branches/2.0: . waskaweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-21 17:10:56 +0100 (Thu, 21 Jan 2010)
New Revision: 807

Modified:
   wasko/branches/2.0/ChangeLog.txt
   wasko/branches/2.0/waskaweb/lib/evaluation.py
Log:
* waskaweb/lib/evaluation.py (Evaluation.where_clause)
(Evaluation._build_eval_where_clause): Remove evalation server
specific code.


Modified: wasko/branches/2.0/ChangeLog.txt
===================================================================
--- wasko/branches/2.0/ChangeLog.txt	2010-01-21 16:03:33 UTC (rev 806)
+++ wasko/branches/2.0/ChangeLog.txt	2010-01-21 16:10:56 UTC (rev 807)
@@ -1,5 +1,12 @@
 2010-01-21  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/lib/evaluation.py (Evaluation.where_clause)
+	(Evaluation._build_eval_where_clause): Remove evalation server
+	specific code.
+
+2010-01-21  Bernhard Herzog  <bh at intevation.de>
+
+
 	* waskaweb/lib/evaluation.py, waskaweb/lib/filecache.py: Fix
 	coding declation.  Emacs doesn't UTF-8 with upper case letters.
 

Modified: wasko/branches/2.0/waskaweb/lib/evaluation.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/evaluation.py	2010-01-21 16:03:33 UTC (rev 806)
+++ wasko/branches/2.0/waskaweb/lib/evaluation.py	2010-01-21 16:10:56 UTC (rev 807)
@@ -88,10 +88,7 @@
         return self.total_valid
 
     def where_clause(self, ids, field="id"):
-        if c.isEvaluationServer:
-            return self._build_eval_where_clause(ids)
-        else:
-            return "(%s)" % where_ids(ids, field)
+        return "(%s)" % where_ids(ids, field)
 
     def _build_eval_where_clause(self, fkz):
         '''Only for evaluation server. Builds where-clause based on fkz'''
@@ -126,13 +123,7 @@
             #(coalesce(%(end_field)s, now()) >= '%(start_date)s'::date)) OR \
             #(st.zugriff >= '%(start_date)s'::date)))" % fields
 
-        # Indicator for inconsistent cases (only for evaluation server)
-        if c.isEvaluationServer and time_interval != 'TRUE':
-            valid_data = "freie_dokumentation_abschlussbewertung IS NULL"
-        else:
-            valid_data = "TRUE"
-
-        where = " AND ".join([fkz, '%s ' % gender, '%s ' % phases, '%s ' % time_interval, '%s ' % valid_data])
+        where = " AND ".join([fkz, '%s ' % gender, '%s ' % phases, '%s ' % time_interval])
         return where
 
     def perform(self):