[Mpuls-commits] r193 - in waska/trunk: . waskaweb/controllers waskaweb/lib

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2008-09-25 11:19:24 +0200 (Thu, 25 Sep 2008)
New Revision: 193

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/controllers/waska.py
   waska/trunk/waskaweb/lib/base.py
Log:
Making checking for evaluation server more robust.


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-09-24 15:41:01 UTC (rev 192)
+++ waska/trunk/ChangeLog.txt	2008-09-25 09:19:24 UTC (rev 193)
@@ -1,3 +1,9 @@
+2008-09-25	Sascha L. Teichmann <sascha.teichmann at intevation.de>
+
+	* waskaweb/controllers/waska.py, waskaweb/lib/base.py: make question
+	  if server is evaluation server more robust. Now it's not mandatory any
+	  more to set evaluation_server in *.ini. It defaults to '0'.
+
 2008-09-24	Torsten Irlaender  <torsten.irlaender at intevation.de>
 
 	Added new evaluation for ESF-Stammblatt. Fix for issue572

Modified: waska/trunk/waskaweb/controllers/waska.py
===================================================================
--- waska/trunk/waskaweb/controllers/waska.py	2008-09-24 15:41:01 UTC (rev 192)
+++ waska/trunk/waskaweb/controllers/waska.py	2008-09-25 09:19:24 UTC (rev 193)
@@ -56,7 +56,7 @@
     @checkRole(('admin_ka', 'cm_ka', 'pb_ka', 'pt_dlr'))
     def start(self):
         user = session['USER_AUTHORIZED']
-        if config['evaluation_server'] == '1': 
+        if config.get('evaluation_server', '0') == '1': 
         # On evaluation server do not try to find out which cases are saved
         # longer than allowed. This would be a real performance killer and
         # cases are anonymized anyway

Modified: waska/trunk/waskaweb/lib/base.py
===================================================================
--- waska/trunk/waskaweb/lib/base.py	2008-09-24 15:41:01 UTC (rev 192)
+++ waska/trunk/waskaweb/lib/base.py	2008-09-25 09:19:24 UTC (rev 193)
@@ -60,7 +60,7 @@
     def __before__(self):
 
         # Determine if we have a server for normal use or for evalutation purpose.
-        c.isEvaluationServer = (config['evaluation_server'] == '1') 
+        c.isEvaluationServer = config.get('evaluation_server', '0') == '1'
 
         try:
             storedHash = session['AUTH']