Changeset 2631 for pykota/trunk/bin/cupspykota

Timestamp:

01/26/06 16:25:44 (18 years ago)

Author:

jerome

Message:

Added support for the CANCEL command in subprocesses launched from the
overwrite_jobticket directive : this will allow end users to be asked
if they really want to proceed to printing once the new version
of pykoticon will be ready.
Several minor fixes.

Files:

• pykota/trunk/bin/cupspykota (modified) (12 diffs)

pykota/trunk/bin/cupspykota

@@ -296 +296 @@
                     self.logdebug("Seen DENY command.")
                     action = "DENY"
+                elif line == "CANCEL" :
+                    self.logdebug("Seen CANCEL command.")
+                    action = "CANCEL"
                 elif line.startswith("USERNAME=") :    
                     username = line.split("=", 1)[1].strip()
@@ -307 +310 @@
             
             # now overwrite the job's ticket if new data was supplied
-            if action :
+            if action == "DENY" :
                 self.Action = action
                 self.Reason = _("You are not allowed to print at this time.")
+            elif action == "CANCEL" :
+                self.Action = action
+                self.Reason = _("Print job cancelled.")
             if username :
                 self.UserName = username
@@ -891 +897 @@
         self.exportPhaseInfo("BEFORE")
         
-        if self.Action != "DENY" : 
+        if self.Action not in ("DENY", "CANCEL") : 
             if self.Printer.MaxJobSize and (self.softwareJobSize > self.Printer.MaxJobSize) :
                 # This printer was set to refuse jobs this large.
@@ -900 +906 @@
                 self.Reason = _("You are not allowed to print so many pages on printer %s at this time.") % self.PrinterName
             
-        if self.Action != "DENY" :
+        if self.Action not in ("DENY", "CANCEL") :
             if self.User.LimitBy == "noprint" :
                 self.printInfo(_("User %s is not allowed to print at this time.") % self.UserName, "warn")
@@ -906 +912 @@
                 self.Reason = _("Your account settings forbid you to print at this time.")
                 
-        if self.Action != "DENY" :
+        if self.Action not in ("DENY", "CANCEL") :
             # If printing is still allowed at this time, we
             # need to extract the billing code information from the database.
@@ -913 +919 @@
             self.getBillingCode()
             
-        if self.Action != "DENY" :
+        if self.Action not in ("DENY", "CANCEL") :
             # If printing is still allowed at this time, we
             # need to check if the job is a dupe or not, and what to do then.
@@ -920 +926 @@
             self.checkIfDupe()
                     
-        if self.Action != "DENY" :
+        if self.Action not in ("DENY", "CANCEL") :
             # If printing is still allowed at this time, we
             # need to check the user's print quota on the current printer.
@@ -962 +968 @@
         if self.Action == "DENY" :
             self.printInfo(_("Job denied, no accounting will be done."))
+        elif self.Action == "CANCEL" :    
+            self.printInfo(_("Job cancelled, no accounting will be done."))
         else :
             self.printInfo(_("Job accounting begins."))
@@ -990 +998 @@
         if self.Action == "DENY" :
             self.printInfo(_("Job denied, no accounting has been done."))
+        elif self.Action == "CANCEL" :    
+            self.printInfo(_("Job cancelled, no accounting has been done."))
         else :
             self.deinstallSigTermHandler()
@@ -1020 +1030 @@
                 self.JobSize = 0
                 self.printInfo(_("Job size forced to 0 because printing is denied."))
+            elif self.Action == "CANCEL" :     
+                self.JobSize = 0
+                self.printInfo(_("Job size forced to 0 because printing was cancelled."))
             else :    
                 self.UserPQuota.resetDenyBannerCounter()
@@ -1028 +1041 @@
             self.printInfo(_("Job size : %i") % self.JobSize)
             
-            if (self.Action == "PROBLEM") and (onbackenderror == "NOCHARGE") :
+            if ((self.Action == "PROBLEM") and (onbackenderror == "NOCHARGE")) or \
+                (self.Action in ("DENY", "CANCEL")) :
                 self.JobPrice = 0.0
             elif (self.User.LimitBy == "nochange") or self.Printer.PassThrough :
@@ -1048 +1062 @@
             
             if hasattr(self, "BillingCode") and self.BillingCode and self.BillingCode.Exists :
-                if (self.Action != "PROBLEM") or (onbackenderror == "CHARGE") :
+                if (self.Action in ("ALLOW", "WARN")) or \
+                   ((self.Action == "PROBLEM") and (onbackenderror == "CHARGE")) :
                     self.BillingCode.consume(self.JobSize, self.JobPrice)
                     self.printInfo(_("Billing code %s was updated.") % self.BillingCode.BillingCode)