Changeset 2721

Timestamp:

02/20/06 23:26:45 (19 years ago)

Author:

jerome

Message:

Added missing description handling stuff

Location:

pykota/trunk/pykota/storages

Files:

• ldapstorage.py (modified) (12 diffs)
• sql.py (modified) (1 diff)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -355 +355 @@
         user = StorageUser(self, username)
         username = self.userCharsetToDatabase(username)
-        result = self.doSearch("(&(objectClass=pykotaAccount)(|(pykotaUserName=%s)(%s=%s)))" % (username, self.info["userrdn"], username), ["pykotaUserName", "pykotaLimitBy", self.info["usermail"], "pykotaOverCharge"], base=self.info["userbase"])
+        result = self.doSearch("(&(objectClass=pykotaAccount)(|(pykotaUserName=%s)(%s=%s)))" % (username, self.info["userrdn"], username), ["pykotaUserName", "pykotaLimitBy", self.info["usermail"], "pykotaOverCharge", "description"], base=self.info["userbase"])
         if result :
             fields = result[0][1]
             user.ident = result[0][0]
+            user.Description = self.databaseToUserCharset(fields.get("description", [None])[0])
             user.Email = fields.get(self.info["usermail"], [None])[0]
             user.LimitBy = fields.get("pykotaLimitBy", ["quota"])[0]
@@ -400 +401 @@
         group = StorageGroup(self, groupname)
         groupname = self.userCharsetToDatabase(groupname)
-        result = self.doSearch("(&(objectClass=pykotaGroup)(|(pykotaGroupName=%s)(%s=%s)))" % (groupname, self.info["grouprdn"], groupname), ["pykotaGroupName", "pykotaLimitBy"], base=self.info["groupbase"])
+        result = self.doSearch("(&(objectClass=pykotaGroup)(|(pykotaGroupName=%s)(%s=%s)))" % (groupname, self.info["grouprdn"], groupname), ["pykotaGroupName", "pykotaLimitBy", "description"], base=self.info["groupbase"])
         if result :
             fields = result[0][1]
             group.ident = result[0][0]
             group.Name = fields.get("pykotaGroupName", [self.databaseToUserCharset(groupname)])[0] 
+            group.Description = self.databaseToUserCharset(fields.get("description", [None])[0])
             group.LimitBy = fields.get("pykotaLimitBy", ["quota"])[0]
             group.AccountBalance = 0.0
@@ -701 +703 @@
         # see comment at the same place in pgstorage.py
         result = self.doSearch("objectClass=pykotaAccount", \
-                                  ["pykotaUserName", "pykotaLimitBy", self.info["usermail"], "pykotaOverCharge"], \
+                                  ["pykotaUserName", "pykotaLimitBy", self.info["usermail"], "pykotaOverCharge", "description"], \
                                   base=self.info["userbase"])
         if result :
@@ -713 +715 @@
                     user.LimitBy = fields.get("pykotaLimitBy", ["quota"])[0]
                     user.OverCharge = float(fields.get("pykotaOverCharge", [1.0])[0])
+                    user.Description = self.databaseToUserCharset(fields.get("description", [""])[0]) 
                     uname = self.userCharsetToDatabase(username)
                     result = self.doSearch("(&(objectClass=pykotaAccountBalance)(|(pykotaUserName=%s)(%s=%s)))" % \
@@ -758 +761 @@
         # see comment at the same place in pgstorage.py
         result = self.doSearch("objectClass=pykotaGroup", \
-                                  ["pykotaGroupName", "pykotaLimitBy"], \
+                                  ["pykotaGroupName", "pykotaLimitBy", "description"], \
                                   base=self.info["groupbase"])
         if result :
@@ -769 +772 @@
                     group.Name = fields.get("pykotaGroupName", [self.databaseToUserCharset(groupname)])[0] 
                     group.LimitBy = fields.get("pykotaLimitBy", ["quota"])[0]
+                    group.Description = self.databaseToUserCharset(fields.get("description", [""])[0]) 
                     group.AccountBalance = 0.0
                     group.LifeTimePaid = 0.0
@@ -867 +871 @@
                        "pykotaLimitBy" : (user.LimitBy or "quota"),
                        "pykotaOverCharge" : str(user.OverCharge),
+                       "description" : self.userCharsetToDatabase(user.Description or "")
                     }   
                        
         if user.Email :
             newfields.update({self.info["usermail"]: user.Email})
-        if user.Description is not None : 
-            newfields.update({"description": self.userCharsetToDatabase(user.Description)})
         mustadd = 1
         if self.info["newuser"].lower() != 'below' :
@@ -933 +936 @@
                       "pykotaGroupName" : gname,
                       "pykotaLimitBy" : (group.LimitBy or "quota"),
+                      "description" : self.userCharsetToDatabase(group.Description or "")
                     } 
-        if group.Description is not None : 
-            newfields.update({"description": self.userCharsetToDatabase(group.Description)})
         mustadd = 1
         if self.info["newgroup"].lower() != 'below' :
@@ -1041 +1043 @@
                        "pykotaLimitBy" : (user.LimitBy or "quota"),
                        "pykotaOverCharge" : str(user.OverCharge),
+                       "description" : self.userCharsetToDatabase(user.Description or ""), 
                     }   
         if user.Email :
             newfields.update({self.info["usermail"]: user.Email})
-        if user.Description is not None : 
-            newfields.update({"description": self.userCharsetToDatabase(user.Description)})
         self.doModify(user.ident, newfields)
         
@@ -1057 +1058 @@
         newfields = {
                        "pykotaLimitBy" : (group.LimitBy or "quota"),
+                       "description" : self.userCharsetToDatabase(group.Description or ""), 
                     }   
-        if group.Description is not None : 
-            newfields.update({"description": self.userCharsetToDatabase(group.Description)})
         self.doModify(group.ident, newfields)
         
@@ -1480 +1480 @@
         entries = [u for u in [self.getUser(name) for name in self.getAllUsersNames(uname)] if u.Exists]
         if entries :
-            result = [ ("dn", "username", "balance", "lifetimepaid", "limitby", "email") ]
+            result = [ ("dn", "username", "balance", "lifetimepaid", "limitby", "email", "description") ]
             for entry in entries :
-                result.append((entry.ident, entry.Name, entry.AccountBalance, entry.LifeTimePaid, entry.LimitBy, entry.Email))
+                result.append((entry.ident, entry.Name, entry.AccountBalance, entry.LifeTimePaid, entry.LimitBy, entry.Email, entry.Description))
             return result 
         
@@ -1500 +1500 @@
         entries = [g for g in [self.getGroup(name) for name in self.getAllGroupsNames(gname)] if g.Exists]
         if entries :
-            result = [ ("dn", "groupname", "limitby", "balance", "lifetimepaid") ]
+            result = [ ("dn", "groupname", "limitby", "balance", "lifetimepaid", "description") ]
             for entry in entries :
-                result.append((entry.ident, entry.Name, entry.LimitBy, entry.AccountBalance, entry.LifeTimePaid))
+                result.append((entry.ident, entry.Name, entry.LimitBy, entry.AccountBalance, entry.LifeTimePaid, entry.Description))
             return result 
         

pykota/trunk/pykota/storages/sql.py

@@ -477 +477 @@
                     user.Email = record.get("email") 
                     user.OverCharge = record.get("overcharge")
+                    user.Description = self.databaseToUserCharset(record.get("description"))
                     user.Exists = 1
                     userpquota = StorageUserPQuota(self, user, printer)