Changeset 1820 for pykota/trunk/bin/cupspykota

Timestamp:

10/13/04 22:51:27 (20 years ago)

Author:

jalet

Message:

Made debugging levels be the same in cupspykota and lprngpykota.
Now outputs more information in informational messages : user, printer, jobid

Files:

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

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.74  2004/10/13 20:51:27  jalet
+# Made debugging levels be the same in cupspykota and lprngpykota.
+# Now outputs more information in informational messages : user, printer, jobid
+#
 # Revision 1.73  2004/10/13 16:56:45  jalet
 # Added a space to the pattern to differentiate jobs which id begins with
@@ -410 +414 @@
             # we deny the job in this case (nothing to print anyway)
             if not self.jobSizeBytes :
-                self.printInfo(_("Job contains no data. Printing is denied."), "warn")
+                self.printMoreInfo(user, printer, _("Job contains no data. Printing is denied."), "warn")
                 action = "DENY"
             else :    
@@ -422 +426 @@
             self.prehook(userpquota)
             
-            self.printInfo(_("Job accounting begins."))
+            self.printMoreInfo(user, printer, _("Job accounting begins."))
             self.accounter.beginJob(printer)
         else :    
@@ -443 +447 @@
             # stops accounting. 
             self.accounter.endJob(printer)
-            self.printInfo(_("Job accounting ends."))
+            self.printMoreInfo(user, printer, _("Job accounting ends."))
                 
             # retrieve the job size    
             if action == "DENY" :
                 jobsize = 0
-                self.printInfo(_("Job size forced to 0 because printing is denied."))
+                self.printMoreInfo(user, printer, _("Job size forced to 0 because printing is denied."))
             else :    
                 jobsize = self.accounter.getJobSize(printer)
-            self.printInfo(_("Job size : %i") % jobsize)
+            self.printMoreInfo(user, printer, _("Job size : %i") % jobsize)
             
             # update the quota for the current user on this printer 
@@ -459 +463 @@
             # adds the current job to history    
             printer.addJobToHistory(self.jobid, user, self.accounter.getLastPageCounter(), action, jobsize, jobprice, self.preserveinputfile, self.title, self.copies, self.options, clienthost, self.jobSizeBytes)
-            self.printInfo(_("Job added to history."))
+            self.printMoreInfo(user, printer, _("Job added to history."))
             
             # exports some new environment variables