Changeset 2463

Timestamp:

09/19/05 09:08:55 (19 years ago)

Author:

jerome

Message:

Now honors the passthrough mode for printers (although it can't be set with pkprinters for now).
The output format for pkprinters --list has changed.
Severity : can be high if thrid party tools rely on the old pkprinters' output format.

Location:

pykota/trunk/bin

Files:

• cupspykota (modified) (3 diffs)
• pkprinters (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -822 +822 @@
         self.exportPhaseInfo("BEFORE")
         
+        if self.Action != "DENY" : 
+            if self.Printer.MaxJobSize and (self.softwareJobSize > self.Printer.MaxJobSize) :
+                # This printer was set to refuse jobs this large.
+                self.printInfo(_("Precomputed job size (%s pages) too large for printer %s.") % (self.softwareJobSize, self.PrinterName), "warn")
+                self.Action = "DENY"
+            
         if self.Action != "DENY" :
             if self.User.LimitBy == "noprint" :
@@ -848 +854 @@
             if self.User.LimitBy in ('noquota', 'nochange') :
                 self.logdebug("User %s is allowed to print with no limit, no need to check quota." % self.UserName)
+            elif self.Printer.PassThrough :    
+                self.logdebug("Printer %s is in PassThrough mode, no need to check quota." % self.PrinterName)
             else :
                 self.logdebug("Checking user %s print quota entry on printer %s" \
@@ -920 +928 @@
             self.printInfo(_("Job size : %i") % self.JobSize)
             
-            if self.User.LimitBy == "nochange" :
+            if (self.User.LimitBy == "nochange") or self.Printer.PassThrough :
                 # no need to update the quota for the current user on this printer
                 self.printInfo(_("User %s's quota on printer %s won't be modified") % (self.UserName, self.PrinterName))

pykota/trunk/bin/pkprinters

@@ -169 +169 @@
                 if parents : 
                     parents = "%s %s" % (_("in"), parents)
-                print "%s [%s] (%s + #*%s) %s" % \
+                print "%s [%s] (%s + #*%s)" % \
                       (printer.Name, printer.Description, printer.PricePerJob, \
-                       printer.PricePerPage, parents)
+                       printer.PricePerPage)
+                print "    %s" % (_("Passthrough mode : %s") % ((printer.PassThrough and _("ON")) or _("OFF")))
+                print "    %s" % (_("Maximum job size : %s") % ((printer.MaxJobSize and (_("%s pages") % printer.MaxJobSize)) or _("Unlimited")))
+                if parents :       
+                    print "    %s" % parents
             else :    
                 if options["charge"] :