[Mpuls-commits] r320 - wasko/trunk/waskaweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-03-03 14:42:52 +0100 (Tue, 03 Mar 2009)
New Revision: 320

Modified:
   wasko/trunk/waskaweb/lib/adelexml.py
Log:
Fixed adele evaluation 


Modified: wasko/trunk/waskaweb/lib/adelexml.py
===================================================================
--- wasko/trunk/waskaweb/lib/adelexml.py	2009-03-03 13:42:05 UTC (rev 319)
+++ wasko/trunk/waskaweb/lib/adelexml.py	2009-03-03 13:42:52 UTC (rev 320)
@@ -49,7 +49,9 @@
     and not (coalesce(datum_cm_start, '1970-01-01'::date) < '%s'::date
              and s.zugriff < '%s'::date)
     -- Kein Begin und Erstgespraech nicht im BZ
-    and not (datum_cm_start IS NULL and (coalesce(erstgespraech,
+    and not (
+    coalesce(datum_cm_ende, now()) > '2008-12-31'::date) and 
+    datum_cm_start IS NULL and (coalesce(erstgespraech,
     '1970-01-01'::date) < '%s'::date or coalesce(erstgespraech,
     '1970-01-01'::date) > '%s'::date)
     )