Changeset 2465 for pykota/trunk/bin/pkprinters

Timestamp:

09/19/05 18:59:00 (19 years ago)

Author:

jerome

Message:

Added support for --maxjobsize, --passthrough and --nopassthrough
in pkprinters.

Files:

• pykota/trunk/bin/pkprinters (modified) (6 diffs)

pykota/trunk/bin/pkprinters

@@ -80 +80 @@
   -s | --skipexisting  In combination with the --add option above, tells
                        pkprinters to not modify existing printers.
+                       
+  -m | --maxjobsize s  Sets the maximum job size allowed on the printer
+                       to s pages.
+                       
+  -p | --passthrough   Activate passthrough mode for the printer. In this
+                       mode, users are allowed to print without any impact
+                       on their quota or account balance.
+                       
+  -n | --nopassthrough Deactivate passthrough mode for the printer.
+                       Without -p or -n, printers are created in 
+                       normal mode, i.e. no passthrough.
   
   printer1 through printerN can contain wildcards if the --add option 
@@ -137 +148 @@
                     charges = [charges[0], None]
                 (perpage, perjob) = charges
+                
+        if options["maxjobsize"] :        
+            try :
+                maxjobsize = int(options["maxjobsize"])
+                if maxjobsize < 0 :
+                    raise ValueError
+            except ValueError :    
+                raise PyKotaToolError, _("Invalid maximum job size value %s") % options["maxjobsize"]
+        else :        
+            maxjobsize = None
+                
                 
         if options["add"] :    
@@ -181 +203 @@
                 if options["description"] is not None :
                     printer.setDescription(options["description"].strip())
+                if options["nopassthrough"] and printer.PassThrough :    
+                    self.storage.setPrinterPassThroughMode(printer, 0)
+                if options["passthrough"] and not printer.PassThrough :    
+                    self.storage.setPrinterPassThroughMode(printer, 1)
+                if (maxjobsize is not None) and (printer.MaxJobSize != maxjobsize) :    
+                    self.storage.setPrinterMaxJobSize(printer, maxjobsize)
                 if options["groups"] :    
                     for pgroup in printersgroups :
@@ -191 +219 @@
     retcode = 0
     try :
-        short_options = "hvac:D:dg:lrs"
-        long_options = ["help", "version", "add", "charge=", "description=", "delete", "groups=", "list", "remove", "skipexisting"]
+        short_options = "hvac:D:dg:lrsnpm:"
+        long_options = ["help", "version", "add", "charge=", "description=", \
+                        "delete", "groups=", "list", "remove", \
+                        "skipexisting", "passthrough", "nopassthrough", \
+                        "maxjobsize="]
         
         # Initializes the command line tool
@@ -212 +243 @@
         options["remove"] = options["r"] or options["remove"]
         options["skipexisting"] = options["s"] or options["skipexisting"]
+        options["maxjobsize"] = options["m"] or options["maxjobsize"]
+        options["passthrough"] = options["p"] or options["passthrough"]
+        options["nopassthrough"] = options["n"] or options["nopassthrough"]
         
         if options["help"] :
@@ -219 +253 @@
         elif (options["delete"] and (options["add"] or options["groups"] or options["charge"] or options["remove"] or options["description"])) \
            or (options["skipexisting"] and not options["add"]) \
-           or (options["list"] and (options["add"] or options["delete"] or options["groups"] or options["charge"] or options["remove"] or options["description"])) :
+           or (options["list"] and (options["add"] or options["delete"] or options["groups"] or options["charge"] or options["remove"] or options["description"])) \
+           or (options["passthrough"] and options["nopassthrough"]) :
             raise PyKotaToolError, _("incompatible options, see help.")
         elif options["remove"] and not options["groups"] :