Changeset 1348 for pykota

Timestamp:

02/18/04 00:41:48 (21 years ago)

Author:

jalet

Message:

Preliminary work on low-level LDAP specific cache.

Files:

• pykota/trunk/pykota/storages/ldapstorage.py (modified) (5 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.52  2004/02/17 23:41:48  jalet
+# Preliminary work on low-level LDAP specific cache.
+#
 # Revision 1.51  2004/02/04 13:24:41  jalet
 # pkprinters can now remove printers from printers groups.
@@ -229 +232 @@
             raise PyKotaStorageError, "Unable to connect to LDAP server %s as %s." % (host, user) # TODO : translate
         else :    
+            self.ldapcache = {} # low-level cache specific to LDAP backend
             self.closed = 0
             self.tool.logdebug("Database opened (host=%s, dbname=%s, user=%s)" % (host, dbname, user))
@@ -273 +277 @@
             base = base or self.basedn
             self.tool.logdebug("QUERY : Filter : %s, BaseDN : %s, Scope : %s, Attributes : %s" % (key, base, scope, fields))
-            result = self.database.search_s(base, scope, key, fields)
+            result = self.database.search_s(base, scope, key, fields) # TODO : put 'None' instead of 'fields'
         except ldap.LDAPError, msg :    
             raise PyKotaStorageError, (_("Search for %s(%s) from %s(scope=%s) returned no answer.") % (key, fields, base, scope)) + " : %s" % str(msg)
         else :     
             self.tool.logdebug("QUERY : Result : %s" % result)
+            for (dn, attributes) in result :
+                self.tool.logdebug("LDAP cache store (%s)" % dn)
+                self.ldapcache[dn] = attributes
             return result
             
     def doAdd(self, dn, fields) :
         """Adds an entry in the LDAP directory."""
+        # TODO : store into LDAP specific cache
         fields = self.normalizeFields(fields)
         try :
@@ -293 +301 @@
     def doDelete(self, dn) :
         """Deletes an entry from the LDAP directory."""
+        # TODO : delete from LDAP specific cache
         try :
             self.tool.logdebug("QUERY : Delete(%s)" % dn)
@@ -302 +311 @@
         """Modifies an entry in the LDAP directory."""
         try :
+            # TODO : take care of, and update LDAP specific cache
+            if self.ldapcache.has_key(dn) :
+                self.tool.logdebug("LDAP cache hit (%s)" % dn)
+            else :    
+                self.tool.logdebug("LDAP cache miss (%s)" % dn)
             oldentry = self.doSearch("objectClass=*", base=dn, scope=ldap.SCOPE_BASE)
             for (k, v) in fields.items() :