Changeset 2735 for pykota/trunk/pykota/storage.py

Timestamp:

02/21/06 16:43:18 (18 years ago)

Author:

jerome

Message:

Completely untested modification stuff...

Files:

• pykota/trunk/pykota/storage.py (modified) (8 diffs)

pykota/trunk/pykota/storage.py

@@ -266 +266 @@
     def setLimits(self, softlimit, hardlimit) :    
         """Sets the soft and hard limit for this quota."""
-        self.parent.writeUserPQuotaLimits(self, softlimit, hardlimit)
         self.SoftLimit = softlimit
         self.HardLimit = hardlimit
         self.DateLimit = None
         self.WarnCount = 0
+        self.isDirty = True
         
     def setUsage(self, used) :
@@ -276 +276 @@
         vused = int(used)
         if used.startswith("+") or used.startswith("-") :
-            self.parent.beginTransaction()
-            try :
-                self.parent.increaseUserPQuotaPagesCounters(self, vused)
-                self.parent.writeUserPQuotaDateLimit(self, None)
-                self.parent.writeUserPQuotaWarnCount(self, 0)
-            except PyKotaStorageError, msg :    
-                self.parent.rollbackTransaction()
-                raise PyKotaStorageError, msg
-            else :
-                self.parent.commitTransaction()
             self.PageCounter += vused
             self.LifePageCounter += vused
         else :
-            self.parent.writeUserPQuotaPagesCounters(self, vused, vused)
             self.PageCounter = self.LifePageCounter = vused
         self.DateLimit = None
         self.WarnCount = 0
+        self.isDirty = 1
 
     def incDenyBannerCounter(self) :
@@ -306 +296 @@
     def reset(self) :    
         """Resets page counter to 0."""
-        self.parent.writeUserPQuotaPagesCounters(self, 0, int(self.LifePageCounter or 0))
         self.PageCounter = 0
         self.DateLimit = None
+        self.isDirty = True
         
     def hardreset(self) :    
         """Resets actual and life time page counters to 0."""
-        self.parent.writeUserPQuotaPagesCounters(self, 0, 0)
         self.PageCounter = self.LifePageCounter = 0
         self.DateLimit = None
+        self.isDirty = True
         
     def computeJobPrice(self, jobsize) :    
@@ -385 +375 @@
                 uq = self.parent.getUserPQuota(user, self.Printer)
                 uq.reset()
-            self.parent.writeGroupPQuotaDateLimit(self, None)
+                uq.save()
         except PyKotaStorageError, msg :    
             self.parent.rollbackTransaction()
@@ -393 +383 @@
         self.PageCounter = 0
         self.DateLimit = None
+        self.isDirty = True
         
     def hardreset(self) :    
@@ -401 +392 @@
                 uq = self.parent.getUserPQuota(user, self.Printer)
                 uq.hardreset()
-            self.parent.writeGroupPQuotaDateLimit(self, None)
+                uq.save()
         except PyKotaStorageError, msg :    
             self.parent.rollbackTransaction()
@@ -409 +400 @@
         self.PageCounter = self.LifePageCounter = 0
         self.DateLimit = None
+        self.isDirty = True
         
     def setDateLimit(self, datelimit) :    
@@ -423 +415 @@
     def setLimits(self, softlimit, hardlimit) :    
         """Sets the soft and hard limit for this quota."""
-        self.parent.writeGroupPQuotaLimits(self, softlimit, hardlimit)
         self.SoftLimit = softlimit
         self.HardLimit = hardlimit
         self.DateLimit = None
+        self.isDirty = True
         
     def delete(self) :