Changeset 1258 for pykota/trunk/bin/edpykota

Timestamp:

01/08/04 17:24:49 (20 years ago)

Author:

jalet

Message:

edpykota now supports adding printers to printer groups.

Files:

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

pykota/trunk/bin/edpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.65  2004/01/08 16:24:49  jalet
+# edpykota now supports adding printers to printer groups.
+#
 # Revision 1.64  2004/01/08 14:10:32  jalet
 # Copyright year changed.
@@ -276 +279 @@
                        by separating them with commas.
   
-  -g | --groups        Edit groups print quotas instead of users.
+  -G | --pgroups pg1[,pg2...] Adds the printer(s) to the printer groups
+                       pg1, pg2, etc... which must already exist.
+                       A printer group is just like a normal printer,
+                       only that it is usually unknown from the printing
+                       system. Create printer groups exactly the same
+                       way that you create printers, then add other 
+                       printers to them with this option.
+                       Accounting is done on a printer and on all
+                       the printer groups it belongs to, quota checking
+                       is done on a printer and on all the printer groups
+                       it belongs to.
+  
+  -g | --groups        Edit users groups print quotas instead of users.
                           
   -p | --prototype u|g Uses user u or group g as a prototype to set
@@ -366 +381 @@
   This will set the page price for printer lp to 0.1. Job price
   will not be changed.
+  
+  $ edpykota --printer hplj1,hplj2 --pgroups Laser,HP
+  
+  This will put printers hplj1 and hplj2 in printers groups Laser and HP.
+  When printing either on hplj1 or hplj2, print quota will also be 
+  checked and accounted for on virtual printers Laser and HP.
 
 This program is free software; you can redistribute it and/or modify
@@ -464 +485 @@
                 names = [ "*" ] # all users
                 
+        printersgroups = []        
+        if options["pgroups"] :        
+            printersgroups = self.storage.getMatchingPrinters(options["pgroups"])
+            
         changed = {} # tracks changes made at the user/group level
         for printer in printers :
+            for pgroup in printersgroups :
+                pgroup.addPrinterToGroup(printer)    
+                
             if options["charge"] :
                 (perpage, perjob) = charges
@@ -576 +604 @@
                      "printer" : "*", \
                    }
-        short_options = "vhdc:l:b:i:naugrp:P:S:H:"
-        long_options = ["help", "version", "charge=", "delete", "limitby=", "balance=", "ingroups=", "noquota", "add", "users", "groups", "reset", "prototype=", "printer=", "softlimit=", "hardlimit="]
+        short_options = "vhdc:l:b:i:naugrp:P:S:H:G:"
+        long_options = ["help", "version", "charge=", "delete", "limitby=", "balance=", "ingroups=", "noquota", "add", "users", "groups", "reset", "prototype=", "printer=", "softlimit=", "hardlimit=", "pgroups="]
         
         # Initializes the command line tool
@@ -602 +630 @@
         options["ingroups"] = options["i"] or options["ingroups"]
         options["charge"] = options["c"] or options["charge"]
+        options["pgroups"] = options["G"] or options["pgroups"]
         
         if options["help"] :