Changeset 3124

Timestamp:

12/13/06 20:51:10 (18 years ago)

Author:

matt

Message:

If a job is cancelled (e.g. by pknotify/pykoticon), make printing start and end banners optional.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (1 diff)
• conf/pykota.conf.sample (modified) (1 diff)
• pykota/config.py (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -827 +827 @@
                 self.UserPQuota.incDenyBannerCounter() # increments the warning counter
                 self.exportUserInfo()
-            getattr(self, "%sBanner" % bannertype)(withaccounting)
+            if (self.Action == 'CANCEL' and not self.config.getPrintCancelledBanners()) :
+                self.logdebug("Print job cancelled, not printing a banner.", "warn")
+            else :
+                getattr(self, "%sBanner" % bannertype)(withaccounting)
         self.logdebug("%s banner done." % bannertype.title())
         

pykota/trunk/conf/pykota.conf.sample

@@ -1046 +1046 @@
 
 
+# If a job is cancelled, should any start or end banners still be printed
+#
+# This option can be set either globally or on a per printer basis.
+# If set to yes, any defined banners will be printed
+# If set to no, no banners will be printed
+#
+# This value defaults to yes
+# printcancelledbanners: yes
+
+
 # StartingBanner : if defined will print a banner before the rest of the job 
 # is printed. The argument can be a printable file, or an executable file.

pykota/trunk/pykota/config.py

@@ -439 +439 @@
         else :    
             return value
-            
+
+    def getPrintCancelledBanners(self, printername) :
+        """Returns 1 if a banner should be printed when a job is cancelled, else 0."""
+        try :
+            return self.isTrue(self.getPrinterOption(printername, "printcancelledbanners"))
+        except PyKotaConfigError :
+            return 0
+             
     def getGraceDelay(self, printername) :    
         """Returns the grace delay in days."""