Changeset 3141

Timestamp:

01/31/07 16:00:41 (18 years ago)

Author:

jerome

Message:

Fixes a problem where banners would still be printed even if the user cancelled the print job.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (4 diffs)
• NEWS (modified) (1 diff)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -1173 +1173 @@
         self.BannerSize = 0
         accountbanner = self.config.getAccountBanner(self.PrinterName)
-        if accountbanner in ["ENDING", "NONE"] :
+        if (self.Action != "CANCEL") and accountbanner in ["ENDING", "NONE"] :
             self.handleBanner("starting", 0)
         
@@ -1187 +1187 @@
         
         # handle starting banner pages with accounting
-        if accountbanner in ["STARTING", "BOTH"] :
+        if (self.Action != "CANCEL") and accountbanner in ["STARTING", "BOTH"] :
             if not self.gotSigTerm :
                 self.handleBanner("starting", 1)
@@ -1201 +1201 @@
         
         # handle ending banner pages with accounting
-        if accountbanner in ["ENDING", "BOTH"] :
+        if (self.Action != "CANCEL") and accountbanner in ["ENDING", "BOTH"] :
             if not self.gotSigTerm :
                 self.handleBanner("ending", 1)
@@ -1289 +1289 @@
         
         # handle ending banner pages without accounting
-        if accountbanner in ["STARTING", "NONE"] :
+        if (self.Action != "CANCEL") and accountbanner in ["STARTING", "NONE"] :
             self.handleBanner("ending", 0)
                     

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.26alpha3 (2007-01-31) :
+    
+        - Doesn't print banners anymore when the user cancelled the print job.
+        
     - 1.26alpha2 (2007-01-18) :
     

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.26alpha2_unofficial"
+__version__ = "1.26alpha3_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."