Changeset 2452 for pykota/trunk/pykota/storages/ldapstorage.py

Timestamp:

09/17/05 16:29:43 (19 years ago)

Author:

jerome

Message:

Upgraded database schema.
Added -i | --ingroups command line option to repykota.
Added -C | --comment command line option to edpykota.
Added 'noquota', 'noprint', and 'nochange' as switches for edpykota's
-l | --limitby command line option.
Severity : entirely new features, in need of testers :-)

Files:

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

pykota/trunk/pykota/storages/ldapstorage.py

@@ -382 +382 @@
                 user.Payments = []
                 for payment in fields.get("pykotaPayments", []) :
-                    (date, amount) = payment.split(" # ")
-                    user.Payments.append((date, float(amount)))
+                    try :
+                        (date, amount, description) = payment.split(" # ")
+                    except ValueError :
+                        # Payment with no description (old Payment)
+                        (date, amount) = payment.split(" # ")
+                        description = ""
+                    else :    
+                        description = self.databaseToUserCharset(description)
+                    user.Payments.append((date, float(amount), description))
             user.Exists = 1
         return user
@@ -935 +942 @@
         return self.doModify(user.idbalance, fields)         
             
-    def writeNewPayment(self, user, amount) :        
+    def writeNewPayment(self, user, amount, comment="") :
         """Adds a new payment to the payments history."""
         payments = []
         for payment in user.Payments :
-            payments.append("%s # %s" % (payment[0], str(payment[1])))
-        payments.append("%s # %s" % (str(DateTime.now()), str(amount)))
+            payments.append("%s # %s # %s" % (payment[0], str(payment[1]), payment[2]))
+        payments.append("%s # %s # %s" % (str(DateTime.now()), str(amount), self.userCharsetToDatabase(comment)))
         fields = {
                    "pykotaPayments" : payments,
@@ -1304 +1311 @@
         entries = [u for u in [self.getUser(name) for name in self.getAllUsersNames(uname)] if u.Exists]
         if entries :
-            result = [ ("username", "amount", "date") ]
+            result = [ ("username", "amount", "date", "description") ]
             for entry in entries :
-                for (date, amount) in entry.Payments :
-                    result.append((entry.Name, amount, date))
+                for (date, amount, description) in entry.Payments :
+                    result.append((entry.Name, amount, date, description))
             return result