Changeset 1376

Timestamp:

03/01/04 16:06:51 (20 years ago)

Author:

jalet

Message:

Pre and Post hooks should now work in the pykota filter too.
The pykota filter doesn't check the last user's quota anymore
when delayed hardware accounting is used : this will be checked
anyway the next time the last user will print

Location:

pykota/trunk

Files:

• bin/pykota (modified) (3 diffs)
• NEWS (modified) (1 diff)
• pykota/storage.py (modified) (2 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/pykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.54  2004/03/01 15:06:51  jalet
+# Pre and Post hooks should now work in the pykota filter too.
+# The pykota filter doesn't check the last user's quota anymore
+# when delayed hardware accounting is used : this will be checked
+# anyway the next time the last user will print
+#
 # Revision 1.53  2004/02/25 12:36:34  jalet
 # Avoids a database query even if caching was disabled.
@@ -250 +256 @@
         #            be allowed if current user is allowed to print on this printer
         if policy == "OK" :
+            # exports user information with initial values
+            self.exportUserInfo(userpquota)
+            
+            # enters first phase
+            os.putenv("PYKOTAPHASE", "BEFORE")
+            
             self.logdebug("Does accounting for user %s on printer %s." % (user.Name, printer.Name))
             action = self.accounter.doAccounting(userpquota)
+            
+            # exports some new environment variables
+            os.putenv("PYKOTAACTION", action)
+            
+            # launches the pre hook
+            self.prehook(userpquota)
         else :        
             action = "ALLOW"
@@ -302 +320 @@
                     lastjobsize = self.accounter.getJobSize()
                     self.logdebug("Last Job size : %i" % lastjobsize)
-                    printer.LastJob.setSize(lastuserpquota, lastjobsize)
+                    lastjobprice = printer.LastJob.setSize(lastuserpquota, lastjobsize)
                     self.logdebug("Updating user %s's quota on printer %s" % (lastuserpquota.User.Name, printer.Name))
                     lastuserpquota.increasePagesUsage(lastjobsize)
-                    self.warnUserPQuota(lastuserpquota)
+                    
+                    # exports user information with final values
+                    self.exportUserInfo(lastuserpquota)
+                    
+                    # enters final phase
+                    os.putenv("PYKOTAPHASE", "AFTER")
+                    os.putenv("PYKOTAACTION", printer.LastJob.JobAction)
+                    os.putenv("PYKOTAJOBSIZE", str(lastjobsize))
+                    os.putenv("PYKOTAJOBPRICE", str(lastjobprice))
+                    
+                    # launches the post hook
+                    self.posthook(lastuserpquota)
+                    
+                    # Code below deactivated since this will be checked
+                    # anyway the next time this user prints 
+                    # finally check last user's quota
+                    # self.warnUserPQuota(lastuserpquota)
                     
         # then deal with current print job as usual            

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.18alpha13 :
+    
+        - Pre and Post hooks are now available in the pykota
+          filter as well.
+          
+        - The pykota filter doesn't check last user's quota
+          anymore : this will be done anyway the next time
+          the last user will print again. 
+        
     - 1.18alpha12 :
     
-        - pre and post hooks to external commands with many 
+        - Pre and Post hooks to external commands with many 
           many environment variables available are useable 
           from the cupspykota backend.

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.49  2004/03/01 15:06:51  jalet
+# Pre and Post hooks should now work in the pykota filter too.
+# The pykota filter doesn't check the last user's quota anymore
+# when delayed hardware accounting is used : this will be checked
+# anyway the next time the last user will print
+#
 # Revision 1.48  2004/02/27 13:50:12  jalet
 # Hopefully the final fix for groups (users and printers)
@@ -474 +480 @@
         self.JobSize = jobsize
         self.JobPrice = jobprice
+        return jobprice
         
 class BaseStorage :

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.18alpha12_unofficial"
+__version__ = "1.18alpha13_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""