Changeset 733

Timestamp:

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

Author:

jalet

Message:

Test wrt date limit was wrong

Location:

pykota/trunk

Files:

• bin/repykota (modified) (4 diffs)
• pykota/tool.py (modified) (3 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/repykota

@@ -17 +17 @@
 #
 # $Log$
+# Revision 1.4  2003/02/07 08:34:15  jalet
+# Test wrt date limit was wrong
+#
 # Revision 1.3  2003/02/07 00:08:52  jalet
 # Typos
@@ -94 +97 @@
             if options["users"] :
                 print "User            used    soft    hard  grace"
-                print "-----------------------------------------------------------"
+                print "------------------------------------------------"
                 for name in self.storage.getPrinterUsers(printer) :
                     quota = self.storage.getUserPQuota(name, printer)
@@ -100 +103 @@
             else :
                 print "Group           used    soft    hard  grace"
-                print "-----------------------------------------------------------"
+                print "------------------------------------------------"
                 for name in self.storage.getPrinterGroups(printer) :
                     quota = self.storage.getGroupPQuota(name, printer) 
@@ -115 +118 @@
                 now = DateTime.now()
                 datelimit = DateTime.ISO.ParseDateTime(datelimit)
-                if datelimit <= now :
+                if now >= datelimit :
                     datelimit = "DENY"
             else :    
                 datelimit = ""
             reached = ((pagecounter >= softlimit) and "+") or "-"
-            print "%-10.10s %c %7i %7i %7i %s" % (name, reached, pagecounter, softlimit, hardlimit, datelimit)
+            print "%-10.10s %c %7i %7i %7i %s" % (name, reached, pagecounter, softlimit, hardlimit, datelimit[:10])
         
                     

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 :    

pykota/trunk/pykota/version.py

@@ -15 +15 @@
 #
 
-__version__ = "0.1-unofficial"
+__version__ = "0.9-unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS."""