error tolerance, fix bug in demo data

Author: Marcel Sander

gengine/models.py

@@ -1135,6 +1135,9 @@ def coords(row):
 safe_dict['or_'] = or_
 safe_dict['abs'] = abs
 
+class FormularEvaluationException(Exception):
+    pass
+
 #TODO: Cache
 def eval_formular(s,params={}):
     """evaluates the formular.
@@ -1147,19 +1150,22 @@ def eval_formular(s,params={}):
     'fmod', 'frexp', 'hypot', 'ldexp', 'log', 'log10', 'modf',
     'pi', 'pow', 'radians', 'sin', 'sinh', 'sqrt', 'tan', 'tanh'
     """
-    if s is None:
-        return None
-    else:
-        p = DictObjectProxy(params)
-        
-        #add any needed builtins back in.
-        safe_dict['p'] = p
-        
-        result = eval(s,{"__builtins__":None},safe_dict)
-        if type(result)==str or type(result)==unicode:
-            return result % params
+    try:
+        if s is None:
+            return None
         else:
-            return result
+            p = DictObjectProxy(params)
+            
+            #add any needed builtins back in.
+            safe_dict['p'] = p
+            
+            result = eval(s,{"__builtins__":None},safe_dict)
+            if type(result)==str or type(result)==unicode:
+                return result % params
+            else:
+                return result
+    except:
+        raise FormularEvaluationException(s)
 
 class DictObjectProxy():
     obj = None

gengine/scripts/initializedb.py

@@ -149,23 +149,23 @@ def add_translation(variable,lang,text):
 
             DBSession.add(AchievementProperty(achievement=achievement_invite, property=property_name, value_translation=transvar_invite_name))
             DBSession.add(AchievementProperty(achievement=achievement_invite, property=property_xp, value='100 * p.level'))
-            DBSession.add(AchievementProperty(achievement=achievement_invite, property=property_icon, value='https://www.gamification-software.com/img/running.png'))
+            DBSession.add(AchievementProperty(achievement=achievement_invite, property=property_icon, value="'https://www.gamification-software.com/img/running.png'"))
             DBSession.add(AchievementProperty(achievement=achievement_invite, property=property_description, value_translation=transvar_invite))
 
-            DBSession.add(AchievementReward(achievement=achievement_invite, reward=reward_badge, value='https://www.gamification-software.com/img/trophy.png', from_level=5))
-            DBSession.add(AchievementReward(achievement=achievement_invite, reward=reward_image, value='https://www.gamification-software.com/img/video-controller-336657_1920.jpg', from_level=5))
+            DBSession.add(AchievementReward(achievement=achievement_invite, reward=reward_badge, value="'https://www.gamification-software.com/img/trophy.png'", from_level=5))
+            DBSession.add(AchievementReward(achievement=achievement_invite, reward=reward_image, value="'https://www.gamification-software.com/img/video-controller-336657_1920.jpg'", from_level=5))
 
             transvar_fittest_name = add_translation_variable(name="fittest_achievement_name")
             add_translation(transvar_fittest_name, lang_en, '"The Fittest!"')
             add_translation(transvar_fittest_name, lang_de, '"Der Fitteste!"')
 
             DBSession.add(AchievementProperty(achievement=achievement_fittest, property=property_name, value_translation=transvar_fittest_name))
             DBSession.add(AchievementProperty(achievement=achievement_fittest, property=property_xp, value='50 + (200 * p.level)'))
-            DBSession.add(AchievementProperty(achievement=achievement_fittest, property=property_icon, value='https://www.gamification-software.com/img/colorwheel.png'))
+            DBSession.add(AchievementProperty(achievement=achievement_fittest, property=property_icon, value="'https://www.gamification-software.com/img/colorwheel.png'"))
             DBSession.add(AchievementProperty(achievement=achievement_fittest, property=property_description, value_translation=transvar_fittest))
 
-            DBSession.add(AchievementReward(achievement=achievement_fittest, reward=reward_badge, value='https://www.gamification-software.com/img/easel.png', from_level=1))
-            DBSession.add(AchievementReward(achievement=achievement_fittest, reward=reward_image, value='https://www.gamification-software.com/img/game-characters-622654.jpg', from_level=1))
+            DBSession.add(AchievementReward(achievement=achievement_fittest, reward=reward_badge, value="'https://www.gamification-software.com/img/easel.png'", from_level=1))
+            DBSession.add(AchievementReward(achievement=achievement_fittest, reward=reward_image, value="'https://www.gamification-software.com/img/game-characters-622654.jpg'", from_level=1))
 
 
             user1 = User(id=1,lat=10,lng=50,timezone="Europe/Berlin")

gengine/views.py

@@ -12,13 +12,15 @@
 from .flaskadmin import flaskadminapp
 from pyramid.wsgi import wsgiapp2, wsgiapp
 from _collections import defaultdict
-from gengine.models import Variable, valid_timezone, Goal, AchievementReward
+from gengine.models import Variable, valid_timezone, Goal, AchievementReward, FormularEvaluationException
 from werkzeug.exceptions import BadRequest
 from gengine.urlcache import set_value
 from pyramid.exceptions import NotFound
 from werkzeug import DebuggedApplication
 from gengine.wsgiutil import HTTPSProxied
 
+import traceback
+
 @view_config(route_name='add_or_update_user', renderer='string')
 def add_or_update_user(request):
     """add a user and set its metadata"""
@@ -71,15 +73,24 @@ def generate():
 
         def ea(achievement):
             try:
+                #print "evaluating "+`achievement["id"]`
                 return Achievement.evaluate(user, achievement["id"])
-            except:
-                return None
+            except FormularEvaluationException as e:
+                return { "error": "Cannot evaluate formular: " + e.message, "id" : achievement["id"] }
+            except Exception as e:
+                tb = traceback.format_exc()
+                return { "error": tb, "id" : achievement["id"] }
 
-        check = lambda x : x!=None and (x["hidden"]==False or x["level"]>0)
+        check = lambda x : x!=None and not x.has_key("error") and (x["hidden"]==False or x["level"]>0)
+        
+        evaluatelist = [ea(achievement) for achievement in achievements]
 
         ret = {
             "achievements" : {
-              x["id"] : x for x in [ea(achievement) for achievement in achievements] if check(x) 
+                x["id"] : x for x in evaluatelist if check(x) 
+            },
+            "achievement_errors" : {
+                x["id"] : x for x in evaluatelist if x!=None and x.has_key("error") 
             }
         }