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

Timestamp:

02/07/03 09:34:16 (21 years ago)

Author:

jalet

Message:

Test wrt date limit was wrong

Files:

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

pykota/trunk/pykota/tool.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.13  2003/02/07 08:34:16  jalet
+# Test wrt date limit was wrong
+#
 # Revision 1.12  2003/02/06 23:20:02  jalet
 # warnpykota doesn't need any user/group name argument, mimicing the
@@ -177 +180 @@
     def checkUserPQuota(self, username, printername) :
         """Checks the user quota on a printer and deny or accept the job."""
-        now = DateTime.now()
         quota = self.storage.getUserPQuota(username, printername)
         if quota is None :
@@ -199 +201 @@
                     action = "ALLOW"
                 elif hardlimit is not None :
-                     gracedelay = self.config.getGraceDelay()
                      if softlimit <= pagecounter < hardlimit :    
+                         now = DateTime.now()
                          if datelimit is None :
-                             datelimit = now + gracedelay
+                             datelimit = now + self.config.getGraceDelay()
                              self.storage.setDateLimit(username, printername, datelimit)
-                         if (now + gracedelay) < datelimit :
+                         if now < datelimit :
                              action = "WARN"
                          else :