Changeset 1495 for pykota/trunk/pykota/tool.py

Timestamp:

05/25/04 00:45:49 (20 years ago)

Author:

jalet

Message:

New 'enforcement' directive added
Polling loop improvements

Files:

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

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.90  2004/05/24 22:45:49  jalet
+# New 'enforcement' directive added
+# Polling loop improvements
+#
 # Revision 1.89  2004/05/21 22:02:52  jalet
 # Preliminary work on pre-accounting
@@ -379 +383 @@
         self.smtpserver = self.config.getSMTPServer()
         self.maildomain = self.config.getMailDomain()
+        self.softwareJobPrice = 0.0
         
     def logdebug(self, message) :    
@@ -513 +518 @@
         user = userpquota.User
         printer = userpquota.Printer
+        enforcement = self.config.getPrinterEnforcement(printer.Name)
         self.logdebug("Checking user %s's quota on printer %s" % (user.Name, printer.Name))
         (policy, dummy) = self.config.getPrinterPolicy(userpquota.Printer.Name)
@@ -524 +530 @@
         else :    
             pagecounter = int(userpquota.PageCounter or 0)
+            if enforcement == "STRICT" :
+                pagecounter += self.softwareJobSize
             if userpquota.SoftLimit is not None :
                 softlimit = int(userpquota.SoftLimit)
@@ -564 +572 @@
         group = grouppquota.Group
         printer = grouppquota.Printer
+        enforcement = self.config.getPrinterEnforcement(printer.Name)
         self.logdebug("Checking group %s's quota on printer %s" % (group.Name, printer.Name))
         if group.LimitBy and (group.LimitBy.lower() == "balance") : 
-            if group.AccountBalance <= 0.0 :
+            val = group.AccountBalance
+            if enforcement == "STRICT" : 
+                val -= self.softwareJobPrice # use precomputed size.
+            if val <= 0.0 :
                 action = "DENY"
-            elif group.AccountBalance <= self.config.getPoorMan() :    
+            elif val <= self.config.getPoorMan() :    
                 action = "WARN"
             else :    
                 action = "ALLOW"
         else :
+            val = grouppquota.PageCounter
+            if enforcement == "STRICT" :
+                val += self.softwareJobSize
             if grouppquota.SoftLimit is not None :
                 softlimit = int(grouppquota.SoftLimit)
-                if grouppquota.PageCounter < softlimit :
+                if val < softlimit :
                     action = "ALLOW"
                 else :    
@@ -583 +598 @@
                     else :    
                         hardlimit = int(grouppquota.HardLimit)
-                        if softlimit <= grouppquota.PageCounter < hardlimit :    
+                        if softlimit <= val < hardlimit :    
                             now = DateTime.now()
                             if grouppquota.DateLimit is not None :
@@ -600 +615 @@
                     # no soft limit, only a hard one.
                     hardlimit = int(grouppquota.HardLimit)
-                    if grouppquota.PageCounter < hardlimit :
+                    if val < hardlimit :
                         action = "ALLOW"
                     else :      
@@ -643 +658 @@
             else :    
                 val = float(user.AccountBalance or 0.0)
+                if self.config.getPrinterEnforcement(printer.Name) == "STRICT" : 
+                    val -= self.softwareJobPrice # use precomputed size.
                 if val <= 0.0 :
                     return "DENY"
@@ -820 +837 @@
     def precomputeJobSize(self) :    
         """Computes the job size with a software method."""
+        self.logdebug("Precomputing job's size with generic PDL analyzer...")
         try :
             parser = pdlanalyzer.PDLAnalyzer(self.jobdatastream)
-            return parser.getJobSize()
+            jobsize = parser.getJobSize()
         except pdlanalyzer.PDLAnalyzerError, msg :    
             # Here we just log the failure, but
@@ -830 +848 @@
             self.logger.log_message(_("Unable to precompute the job's size with the generic PDL analyzer."), "warn")
             return 0
+        else :    
+            if ((self.printingsystem == "CUPS") \
+                and (self.preserveinputfile is not None)) \
+                or (self.printingsystem != "CUPS") :
+                return jobsize * self.copies
+            else :        
+                return jobsize
             
     def sigterm_handler(self, signum, frame) :