Changeset 1529 for pykota/trunk

Timestamp:

06/08/04 00:45:35 (20 years ago)

Author:

jalet

Message:

Now accepts a job when enforcement is STRICT and predicted account balance
is equal to 0.0 : since the job hasn't been printed yet, only its printing
will really render balance equal to 0.0, so we should be allowed to print.

Files:

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

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.97  2004/06/07 22:45:35  jalet
+# Now accepts a job when enforcement is STRICT and predicted account balance
+# is equal to 0.0 : since the job hasn't been printed yet, only its printing
+# will really render balance equal to 0.0, so we should be allowed to print.
+#
 # Revision 1.96  2004/06/05 22:18:04  jalet
 # Now catches some exceptions earlier.
@@ -634 +639 @@
             else :    
                 action = "ALLOW"
+            if (enforcement == "STRICT") and (val == 0.0) :
+                action = "WARN" # we can still print until account is 0
         else :
             val = grouppquota.PageCounter
@@ -708 +715 @@
             else :    
                 val = float(user.AccountBalance or 0.0)
-                if self.config.getPrinterEnforcement(printer.Name) == "STRICT" : 
+                enforcement = self.config.getPrinterEnforcement(printer.Name)
+                if enforcement == "STRICT" : 
                     val -= self.softwareJobPrice # use precomputed size.
                 if val <= 0.0 :
-                    return "DENY"
+                    action = "DENY"
                 elif val <= self.config.getPoorMan() :    
-                    return "WARN"
-                else :    
-                    return "ALLOW"
+                    action = "WARN"
+                else :
+                    action = "ALLOW"
+                if (enforcement == "STRICT") and (val == 0.0) :
+                    action = "WARN" # we can still print until account is 0
+                return action    
         else :
             # Then check the user quota on current printer and all its parents.