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

Timestamp:

02/13/05 23:02:29 (19 years ago)

Author:

jalet

Message:

Big database structure changes. Upgrade script is now included as well as
the new LDAP schema.
Introduction of the -o | --overcharge command line option to edpykota.
The output of repykota is more complete, but doesn't fit in 80 columns anymore.
Introduction of the new 'maxdenybanners' directive.

Files:

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

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.68  2005/02/13 22:02:29  jalet
+# Big database structure changes. Upgrade script is now included as well as
+# the new LDAP schema.
+# Introduction of the -o | --overcharge command line option to edpykota.
+# The output of repykota is more complete, but doesn't fit in 80 columns anymore.
+# Introduction of the new 'maxdenybanners' directive.
+#
 # Revision 1.67  2005/01/18 19:47:50  jalet
 # Big bug fix wrt the datelimit attribute
@@ -276 +283 @@
         self.LifeTimePaid = None
         self.Email = None
+        self.OverCharge = 1.0
         self.Payments = [] # TODO : maybe handle this smartly for SQL, for now just don't retrieve them
         
@@ -308 +316 @@
             self.LimitBy = limitby
         
+    def setOverChargeFactor(self, factor) :    
+        """Sets the user's overcharging coefficient."""
+        self.parent.writeUserOverCharge(self, factor)
+        self.OverCharge = factor
+        
     def delete(self) :    
         """Deletes an user from the Quota Storage."""
@@ -357 +370 @@
         self.PricePerJob = None
         self.Description = None
+        self.Coefficients = None
         
     def __getattr__(self, name) :    
@@ -424 +438 @@
         self.HardLimit = None
         self.DateLimit = None
+        self.WarnCount = None
         
     def __getattr__(self, name) :    
@@ -445 +460 @@
         self.HardLimit = hardlimit
         self.DateLimit = None
+        self.WarnCount = 0
         
     def setUsage(self, used) :
@@ -454 +470 @@
                 self.parent.increaseUserPQuotaPagesCounters(self, vused)
                 self.parent.writeUserPQuotaDateLimit(self, None)
+                self.parent.writeUserPQuotaWarnCount(self, 0)
             except PyKotaStorageError, msg :    
                 self.parent.rollbackTransaction()
@@ -465 +482 @@
             self.PageCounter = self.LifePageCounter = vused
         self.DateLimit = None
+        self.WarnCount = 0
 
+    def warn(self) :
+        """Increases the warn counter for this user quota."""
+        self.parent.increaseUserPQuotaWarnCount(self)
+        self.WarnCount = (self.WarnCount or 0) + 1
+        
     def reset(self) :    
         """Resets page counter to 0."""
@@ -482 +505 @@
         totalprice = 0.0    
         if jobsize :
-            for upq in [ self ] + self.ParentPrintersUserPQuota :
-                price = (float(upq.Printer.PricePerPage or 0.0) * jobsize) + float(upq.Printer.PricePerJob or 0.0)
-                totalprice += price
-        return totalprice    
+            if self.User.OverCharge != 0.0 :    # optimization, but TODO : beware of rounding errors
+                for upq in [ self ] + self.ParentPrintersUserPQuota :
+                    price = (float(upq.Printer.PricePerPage or 0.0) * jobsize) + float(upq.Printer.PricePerJob or 0.0)
+                    totalprice += price
+        if self.User.OverCharge != 1.0 : # TODO : beware of rounding errors
+            overcharged = totalprice * self.User.OverCharge        
+            self.parent.tool.printInfo("Overcharging %s by a factor of %s ===> User %s will be charged for %s units." % (totalprice, self.User.OverCharge, self.User.Name, overcharged))
+            return overcharged
+        else :    
+            return totalprice
             
     def increasePagesUsage(self, jobsize) :
@@ -589 +618 @@
         self.JobOptions = None
         self.JobHostName = None
+        self.JobMD5Sum = None
+        self.JobPages = None
+        self.JobBillingCode = None
         
     def __getattr__(self, name) :