Changeset 2452 for pykota/trunk/pykota/storage.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/storage.py (modified) (4 diffs)

pykota/trunk/pykota/storage.py

@@ -59 +59 @@
         self.AccountBalance = float(self.AccountBalance or 0.0) - amount
         
-    def setAccountBalance(self, balance, lifetimepaid) :    
+    def setAccountBalance(self, balance, lifetimepaid, comment="") :
         """Sets the user's account balance in case he pays more money."""
         diff = float(lifetimepaid or 0.0) - float(self.LifeTimePaid or 0.0)
@@ -65 +65 @@
         try :
             self.parent.writeUserAccountBalance(self, balance, lifetimepaid)
-            self.parent.writeNewPayment(self, diff)
+            self.parent.writeNewPayment(self, diff, comment)
         except PyKotaStorageError, msg :    
             self.parent.rollbackTransaction()
@@ -80 +80 @@
         except AttributeError :    
             limitby = "quota"
-        if limitby in ["quota", "balance", "quota-then-balance", "balance-then-quota"] :
+        if limitby in ["quota", "balance", \
+                       "noquota", "noprint", "nochange"] :
             self.parent.writeUserLimitBy(self, limitby)
             self.LimitBy = limitby
@@ -120 +121 @@
         except AttributeError :    
             limitby = "quota"
-        if limitby in ["quota", "balance"] :
+        if limitby in ["quota", "balance", "noquota"] :
             self.parent.writeGroupLimitBy(self, limitby)
             self.LimitBy = limitby