[Mpuls-commits] r383 - in wasko/trunk: . waskaweb/model

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2009-03-17 15:55:32 +0100 (Tue, 17 Mar 2009)
New Revision: 383

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/model/casedocument.py
Log:
 Fixed bug with rule evaluation in save data.



Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-03-17 14:45:28 UTC (rev 382)
+++ wasko/trunk/ChangeLog.txt	2009-03-17 14:55:32 UTC (rev 383)
@@ -1,5 +1,10 @@
 2009-03-17	Sascha L. Teichmann	<teichmann at intevation.de>
 
+	* waskaweb/model/casedocument.py: Fixed bug with rule evaluation
+	  in save data.
+
+2009-03-17	Sascha L. Teichmann	<teichmann at intevation.de>
+
 	* waskaweb/model/casedocument.py: Fixed bugs with old values.
 
 2009-03-17	Sascha L. Teichmann	<teichmann at intevation.de>

Modified: wasko/trunk/waskaweb/model/casedocument.py
===================================================================
--- wasko/trunk/waskaweb/model/casedocument.py	2009-03-17 14:45:28 UTC (rev 382)
+++ wasko/trunk/waskaweb/model/casedocument.py	2009-03-17 14:55:32 UTC (rev 383)
@@ -389,12 +389,11 @@
                     isNull = False
                     for dep in expr.getDependencies():
                         if dep != k: 
-                            ov = getValue(k)
+                            ov = getValue(dep)
                             if ov is None: isNull = True; break
                             vars[dep] = ov
-                    if isNull:
-                        simulation[k] = v
-                    else:
+
+                    if not isNull:
                         vars[k] = v
                         try:
                             okay = expr.evaluate(vars)