Changeset 3146 for pykota/trunk

Timestamp:

02/20/07 23:36:46 (18 years ago)

Author:

matt

Message:

Allow overwrite_jobticket scripts to output a REASON= line to change the default reason a job was denied or cancelled.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (3 diffs)
• conf/pykota.conf.sample (modified) (2 diffs)

pykota/trunk/bin/cupspykota

@@ -438 +438 @@
         jobticketcommand = self.config.getOverwriteJobTicket(self.PrinterName)
         if jobticketcommand :
-            username = billingcode = action = None
+            username = billingcode = action = reason = None
             self.logdebug("Launching subprocess [%s] to overwrite the job ticket." \
                                      % jobticketcommand)
@@ -458 +458 @@
                         billingcode = self.userCharsetToUTF8(line.split("=", 1)[1].strip())
                         self.logdebug("Seen new billing code [%s]" % billingcode)
+                    elif line.startswith("REASON=") :
+                        reason = self.userCharsetToUTF8(line.split("=", 1)[1].strip())
+                        self.logdebug("Seen new reason [%s]" % reason)
             except IOError, msg :            
                 self.logdebug("IOError while reading subprocess' output : %s" % msg)
@@ -466 +469 @@
             if action == "DENY" :
                 self.Action = action
-                self.Reason = _("You are not allowed to print at this time.")
+                self.Reason = (reason or _("You are not allowed to print at this time."))
             elif action == "CANCEL" :
                 self.Action = action
-                self.Reason = _("Print job cancelled.")
+                self.Reason = (reason or _("Print job cancelled."))
                 os.environ["PYKOTASTATUS"] = "CANCELLED"
             else :

pykota/trunk/conf/pykota.conf.sample

@@ -455 +455 @@
 #    USERNAME=the_username_we_want_to_overwrite_with
 #    BILLINGCODE=the_billingcode_we_want_to_overwrite_with
+#    REASON=reason_we_chose_deny_or_cancel
 #    AUTH=NO (equivalent to DENY below)
 #    DENY 
@@ -467 +468 @@
 # used unchanged.
 # If DENY or CANCEL is output, neither the username nor the
-# billing code can be overwritten.
+# billing code can be overwritten. 
+# If REASON is output, that will be used in the notification in the case of 
+# DENY or CANCEL. Otherwise, the built-in reasons will be used.
 #
 # This value can be set either globally or on a per printer basis