Changeset 2692 for pykota/trunk/pykota

Timestamp:

02/14/06 16:18:45 (18 years ago)

Author:

jerome

Message:

Added the 'duplicatesdelay' and 'balancezero' directives.

Location:

pykota/trunk/pykota

Files:

• config.py (modified) (2 diffs)
• reporter.py (modified) (2 diffs)
• tool.py (modified) (4 diffs)
• version.py (modified) (1 diff)

pykota/trunk/pykota/config.py

@@ -439 +439 @@
             raise PyKotaConfigError, _("Invalid poor man's threshold %s") % pm
             
+    def getBalanceZero(self) :    
+        """Returns the value of the zero for balance limitation."""
+        try :
+            bz = self.getGlobalOption("balancezero")
+        except PyKotaConfigError :    
+            bz = 0.0    # default value, zero is 0.0
+        try :
+            return float(bz)
+        except (TypeError, ValueError) :    
+            raise PyKotaConfigError, _("Invalid balancezero value %s") % bz
+            
     def getPoorWarn(self) :    
         """Returns the poor man's warning message."""
@@ -516 +527 @@
                 # it's a command to run.
                 return denyduplicates
+                
+    def getDuplicatesDelay(self, printername) :          
+        """Returns the number of seconds after which two identical jobs are not considered a duplicate anymore."""
+        try : 
+            duplicatesdelay = self.getPrinterOption(printername, "duplicatesdelay")
+        except PyKotaConfigError :    
+            return 0
+        else :    
+            try :
+                return int(duplicatesdelay)
+            except (TypeError, ValueError) :
+                raise PyKotaConfigError, _("Incorrect value %s for the duplicatesdelay directive in section %s") % (str(duplicatesdelay), printername)
         
     def getWinbindSeparator(self) :          

pykota/trunk/pykota/reporter.py

@@ -100 +100 @@
         else :
             if entry.LimitBy.lower() == "balance" :
-                if balance == 0.0 :
+                balancezero = self.tool.config.getBalanceZero()
+                if balance == balancezero :
                     if entry.OverCharge > 0 :
                         datelimit = "DENY"
@@ -109 +110 @@
                         datelimit = ""
                         reached = "-B"
-                elif balance < 0 :
+                elif balance < balancezero :
                     datelimit = "DENY"
                     reached = "+B"

pykota/trunk/pykota/tool.py

@@ -458 +458 @@
             if enforcement == "STRICT" : 
                 val -= self.softwareJobPrice # use precomputed size.
-            if val <= 0.0 :
+            balancezero = self.config.getBalanceZero()
+            if val <= balancezero :
                 action = "DENY"
             elif val <= self.config.getPoorMan() :    
@@ -464 +465 @@
             else :    
                 action = "ALLOW"
-            if (enforcement == "STRICT") and (val == 0.0) :
+            if (enforcement == "STRICT") and (val == balancezero) :
                 action = "WARN" # we can still print until account is 0
         else :
@@ -549 +550 @@
                     if enforcement == "STRICT" : 
                         val -= self.softwareJobPrice # use precomputed size.
-                    if val <= 0.0 :
+                    balancezero = self.config.getBalanceZero()    
+                    if val <= balancezero :
                         action = "DENY"
                     elif val <= self.config.getPoorMan() :    
@@ -555 +557 @@
                     else :
                         action = "ALLOW"
-                    if (enforcement == "STRICT") and (val == 0.0) :
+                    if (enforcement == "STRICT") and (val == balancezero) :
                         action = "WARN" # we can still print until account is 0
                 return action    

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.24alpha11_unofficial"
+__version__ = "1.24alpha12_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."