Changeset 1147

Timestamp:

10/07/03 16:23:25 (21 years ago)

Author:

jalet

Message:

More work on cache

Location:

pykota/trunk

Files:

• conf/pykota.conf.sample (modified) (1 diff)
• pykota/storages/ldapstorage.py (modified) (2 diffs)

pykota/trunk/conf/pykota.conf.sample

@@ -55 +55 @@
 # If unset, caching is disabled. Possible values Y/N/YES/NO
 # caching mechanism works with both PostgreSQL and OpenLDAP backends
-# but may be interesting only with OpenLDAP.
+# but may be really interesting only with OpenLDAP.
+#
+# ACTIVATING CACHE IS HEAVILY RECOMMANDED WITH THE LDAP BACKEND !
+#
 storagecaching: No
 

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.32  2003/10/07 14:23:25  jalet
+# More work on cache
+#
 # Revision 1.31  2003/10/07 09:07:30  jalet
 # Character encoding added to please latest version of Python
@@ -405 +408 @@
         """Returns the user's groups list."""
         groups = []
-        result = self.doSearch("(&(objectClass=pykotaGroup)(%s=%s))" % (self.info["groupmembers"], user.Name), [self.info["grouprdn"]], base=self.info["groupbase"])
+        result = self.doSearch("(&(objectClass=pykotaGroup)(%s=%s))" % (self.info["groupmembers"], user.Name), [self.info["grouprdn"], "pykotaGroupName", "pykotaLimitBy"], base=self.info["groupbase"])
         if result :
             for (groupid, fields) in result :
-                groups.append(self.getGroup(fields.get(self.info["grouprdn"])[0]))
+                groupname = (fields.get("pykotaGroupName", [None]) or fields.get(self.info["grouprdn"], [None]))[0]
+                group = self.getFromCache("GROUPS", groupname)
+                if group is None :
+                    group = StorageGroup(self, groupname)
+                    group.ident = groupid
+                    group.LimitBy = fields.get("pykotaLimitBy")
+                    if group.LimitBy is not None :
+                        group.LimitBy = group.LimitBy[0]
+                    group.AccountBalance = 0.0
+                    group.LifeTimePaid = 0.0
+                    for member in self.getGroupMembers(group) :
+                        if member.Exists :
+                            group.AccountBalance += member.AccountBalance
+                            group.LifeTimePaid += member.LifeTimePaid
+                    group.Exists = 1
+                    self.cacheEntry("GROUPS", group.Name, group)
+                groups.append(group)
         return groups