[Mpuls-commits] r5983 - base/trunk/mpulsweb/model

[scm-commit at wald.intevation.org]

Author: bricks
Date: 2012-06-14 13:51:35 +0200 (Thu, 14 Jun 2012)
New Revision: 5983

Modified:
   base/trunk/mpulsweb/model/agencysettings.py
Log:
Lazy load agency settings

If the agency settings from the ka_konfiguratio_tbl aren't read
don't load them from the database.


Modified: base/trunk/mpulsweb/model/agencysettings.py
===================================================================
--- base/trunk/mpulsweb/model/agencysettings.py	2012-06-11 13:21:22 UTC (rev 5982)
+++ base/trunk/mpulsweb/model/agencysettings.py	2012-06-14 11:51:35 UTC (rev 5983)
@@ -50,10 +50,16 @@
 class Agency(object):
 
     def __init__(self):
-        self.conf = {}
-        self._fetchData()
+        self._conf = None
 
+    @property
+    def conf(self):
+        if self._conf is None:
+            self._fetchData()
+        return self._conf
+
     def _fetchData(self):
+        self._conf = {}
         conn, cur = None, None
         try:
             conn = db.getConnection()
@@ -70,7 +76,7 @@
                     wert = False
                 else:
                     wert = ensure_unicode(row['wert'])
-                self.conf[row['bez']] = wert
+                self._conf[row['bez']] = wert
         finally:
             db.recycleConnection(conn, cur)
 
@@ -108,39 +114,39 @@
             traceback.print_exc(file=sys.stderr)
 
     def isAnonTransfer(self):
-        return self.conf.get('anon_transfer', True)
+        return self.get_value('anon_transfer', True)
 
     def getFKZ(self):
-        return self.conf.get('fkz', u'')
+        return self.get_value('fkz', u'')
 
     def getName(self):
-        return self.conf.get('ka_name', u'')
+        return self.get_value('ka_name', u'')
 
     def getAddress(self):
-        return self.conf.get('ka_adresse', u'')
+        return self.get_value('ka_adresse', u'')
 
     def getMaxSavetime(self):
-        return self.conf.get('max_speicherdauer', u'')
+        return self.get_value('max_speicherdauer', u'')
 
     def getReminderCondition(self):
         default = g.mpuls_config.get('case', 'remindercondition')
-        return self.conf.get('remindercondition', '') or default
+        return self.get_value('remindercondition', '') or default
 
     def getReminderConditionDesc(self):
         default = g.mpuls_config.get('case', 'reminderconditiondesc')
-        return self.conf.get('reminderconditiondesc', '') or default
+        return self.get_value('reminderconditiondesc', '') or default
 
     def getPrivacyStatement(self):
-        form = self.conf.get('ee_formular', '')
+        form = self.get_value('ee_formular', '')
         if len(form) > 0:
             return form
         return render('/privacy/default/privacy_statement.html')
 
     def getMetaUserName(self):
-        return self.conf.get('meta_user_name', u'')
+        return self.get_value('meta_user_name', u'')
 
     def getMetaUserPassword(self):
-        return self.conf.get('meta_user_password', u'')
+        return self.get_value('meta_user_password', u'')
 
     def is_metauser_configured(self):
         """Return whether the meta user is configured.