Changeset 832

Timestamp:

03/07/03 23:16:57 (21 years ago)

Author:

jalet

Message:

Algorithmically incorrect : last user quota wasn't updated if current
user wasn't allowed to print.

Files:

• pykota/trunk/bin/pykota (modified) (2 diffs)

pykota/trunk/bin/pykota

@@ -17 +17 @@
 #
 # $Log$
+# Revision 1.14  2003/03/07 22:16:57  jalet
+# Algorithmically incorrect : last user quota wasn't updated if current
+# user wasn't allowed to print.
+#
 # Revision 1.13  2003/02/27 23:59:28  jalet
 # Stupid bug wrt exception handlingand value conversion
@@ -148 +152 @@
         # Update the last page counter and last username in the Quota Storage backend
         # set them to current user and 
-        kotafilter.storage.updatePrinterPageCounter(kotafilter.printername, username, counterbeforejob) # TODO : allow or deny users not in quota system, and die cleanly if needed
+        kotafilter.storage.updatePrinterPageCounter(kotafilter.printername, username, counterbeforejob)
         
+        # Was the printer ever used ?
+        if (lastpagecounter is None) or (lastusername is None) :
+            lastusername = username
+            lastpagecounter = counterbeforejob
+            
+        # Update the quota for the previous user on this printer according 
+        # to the job size (difference between actual counter and latest one from storage)
+        jobsize = (counterbeforejob - lastpagecounter)    
+        if jobsize >= 0 :
+            kotafilter.storage.updateUserPQuota(lastusername, kotafilter.printername, jobsize)
+            kotafilter.warnUserPQuota(lastusername)
+        else :    
+            kotafilter.logger.log_message(_("Error in page count value %i for user %s on printer %s") % (jobsize, kotafilter.printername, lastusername), "error")
+            
         # Is the current user allowed to print at all ?
+        # if no then die, else proceed.
         action = kotafilter.warnUserPQuota(username)
         if action == "DENY" :
             # No, just die cleanly
             return 1
-            
-        # Yes     
-        if (lastpagecounter is None) or (lastusername is None) :
-            lastusername = username
-            lastpagecounter = counterbeforejob
-        jobsize = (counterbeforejob - lastpagecounter)    
-        if jobsize >= 0:
-            kotafilter.storage.updateUserPQuota(lastusername, kotafilter.printername, jobsize)
-            kotafilter.warnUserPQuota(lastusername)
-        else :    
-            kotafilter.logger.log_message(_("Error in page count value %i for user %s on printer %s") % (jobsize, kotafilter.printername, lastusername), "error")
         
     # pass the job untouched to the underlying layer