Changeset 1742

Timestamp:

09/24/04 22:21:50 (20 years ago)

Author:

jalet

Message:

Fixed pykotaAccountBalance object location during creation

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/storage.py (modified) (3 diffs)
• pykota/storages/ldapstorage.py (modified) (5 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.20alpha15 :
+    
+        - LDAP pykotaAccountBalance objects were always created
+          attached to the pykotaUser objects. This is now
+          fixed and the value of balancebase in pykota.conf
+          is now correctly used.
+          
     - 1.20alpha14 :
     

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.60  2004/09/24 20:21:50  jalet
+# Fixed pykotaAccountBalance object location during creation
+#
 # Revision 1.59  2004/09/10 21:32:52  jalet
 # Small fixes for incomplete entry intialization
@@ -544 +547 @@
     def getFromCache(self, cachetype, key) :
         """Tries to extract something from the cache."""
+        entry = None    # just to please pychecker
         if self.usecache :
             entry = self.caches[cachetype].get(key)
@@ -550 +554 @@
             else :    
                 self.tool.logdebug("Cache miss (%s->%s)" % (cachetype, key))
-            return entry    
+        return entry    
             
     def cacheEntry(self, cachetype, key, value) :        

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.75  2004/09/24 20:21:50  jalet
+# Fixed pykotaAccountBalance object location during creation
+#
 # Revision 1.74  2004/09/02 10:09:30  jalet
 # Fixed bug in LDAP user deletion code which didn't correctly delete the user's
@@ -501 +504 @@
                 user.LimitBy = user.LimitBy[0]
             result = self.doSearch("(&(objectClass=pykotaAccountBalance)(|(pykotaUserName=%s)(%s=%s)))" % (username, self.info["balancerdn"], username), ["pykotaBalance", "pykotaLifeTimePaid", "pykotaPayments"], base=self.info["balancebase"])
-            if result :
+            if not result :
+                raise PyKotaStorageError, _("No pykotaAccountBalance object found for user %s. Did you create LDAP entries manually ?") % username
+            else :
                 fields = result[0][1]
                 user.idbalance = result[0][0]
@@ -803 +808 @@
         newfields = {
                        "pykotaUserName" : user.Name,
-                       "pykotaLimitBY" : (user.LimitBy or "quota"),
-                       "pykotaBalance" : str(user.AccountBalance or 0.0),
-                       "pykotaLifeTimePaid" : str(user.LifeTimePaid or 0.0),
+                       "pykotaLimitBy" : (user.LimitBy or "quota"),
                     }   
+                       
         if user.Email :
             newfields.update({self.info["usermail"]: user.Email})
@@ -820 +824 @@
                 fields["objectClass"].extend(["pykotaAccount", "pykotaAccountBalance"])
                 fields.update(newfields)
+                fields.update({ "pykotaBalance" : str(user.AccountBalance or 0.0),
+                                "pykotaLifeTimePaid" : str(user.LifeTimePaid or 0.0), })   
                 self.doModify(dn, fields)
                 mustadd = 0
@@ -830 +836 @@
                 
         if mustadd :
-            fields = { self.info["userrdn"] : user.Name,
-                       "objectClass" : ["pykotaObject", "pykotaAccount", "pykotaAccountBalance"],
-                       "cn" : user.Name,
-                     } 
+            if self.info["userbase"] == self.info["balancebase"] :            
+                fields = { self.info["userrdn"] : user.Name,
+                           "objectClass" : ["pykotaObject", "pykotaAccount", "pykotaAccountBalance"],
+                           "cn" : user.Name,
+                           "pykotaBalance" : str(user.AccountBalance or 0.0),
+                           "pykotaLifeTimePaid" : str(user.LifeTimePaid or 0.0), 
+                         } 
+            else :             
+                fields = { self.info["userrdn"] : user.Name,
+                           "objectClass" : ["pykotaObject", "pykotaAccount"],
+                           "cn" : user.Name,
+                         } 
             fields.update(newfields)         
             dn = "%s=%s,%s" % (self.info["userrdn"], user.Name, self.info["userbase"])
             self.doAdd(dn, fields)
+            if self.info["userbase"] != self.info["balancebase"] :            
+                fields = { self.info["balancerdn"] : user.Name,
+                           "objectClass" : ["pykotaObject", "pykotaAccountBalance"],
+                           "cn" : user.Name,
+                           "pykotaBalance" : str(user.AccountBalance or 0.0),
+                           "pykotaLifeTimePaid" : str(user.LifeTimePaid or 0.0),  
+                         } 
+                dn = "%s=%s,%s" % (self.info["balancerdn"], user.Name, self.info["balancebase"])
+                self.doAdd(dn, fields)
+            
         return self.getUser(user.Name)
         

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.20alpha14_unofficial"
+__version__ = "1.20alpha15_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""