Changeset 2073

Timestamp:

02/19/05 18:47:19 (19 years ago)

Author:

jalet

Message:

Fixed the --prototype command line option to edpykota

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (6 diffs)
• NEWS (modified) (1 diff)
• pykota/version.py (modified) (1 diff)
• TODO (modified) (1 diff)

pykota/trunk/bin/edpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.88  2005/02/19 17:47:19  jalet
+# Fixed the --prototype command line option to edpykota
+#
 # Revision 1.87  2005/02/13 22:02:28  jalet
 # Big database structure changes. Upgrade script is now included as well as
@@ -600 +603 @@
             groupnames = []
             
-        if options["prototype"] :    
-            protoentry = getattr(self.storage, "get%s" % suffix)(options["prototype"])
-            
         rejectunknown = self.config.getRejectUnknown()    
         printeradded = 0
@@ -634 +634 @@
             printersgroups = self.storage.getMatchingPrinters(options["pgroups"])
             
+        if options["prototype"] :    
+            protoentry = getattr(self.storage, "get%s" % suffix)(options["prototype"])
+            if not protoentry.Exists :
+                raise PyKotaToolError, _("Prototype object %s not found in Quota Storage.") % protoentry.Name
+            else :    
+                limitby = protoentry.LimitBy
+                balancevalue = protoentry.AccountBalance
+                balance = str(balance)
+                overcharge = getattr(protoentry, "OverCharge", None)
+            
         todelete = {}    
         changed = {} # tracks changes made at the user/group level
@@ -645 +655 @@
                 
             if options["prototype"] :
-                if protoentry.Exists :
-                    protoquota = getattr(self.storage, "get%sPQuota" % suffix)(protoentry, printer)
-                    if not protoquota.Exists :
-                        self.printInfo(_("Prototype %s not found in Quota Storage for printer %s.") % (protoentry.Name, printer.Name))
-                        continue    # skip this printer
-                    else :    
-                        (softlimit, hardlimit) = (protoquota.SoftLimit, protoquota.HardLimit)
-                else :        
-                    self.printInfo(_("Prototype object %s not found in Quota Storage.") % protoentry.Name)
+                protoquota = getattr(self.storage, "get%sPQuota" % suffix)(protoentry, printer)
+                if not protoquota.Exists :
+                    self.printInfo(_("Prototype %s not found in Quota Storage for printer %s.") % (protoentry.Name, printer.Name))
+                else :    
+                    (softlimit, hardlimit) = (protoquota.SoftLimit, protoquota.HardLimit)
                     
             if not options["noquota"] :    
@@ -745 +751 @@
                         
                     if not options["groups"] :
-                        if options["used"] :
+                        if used :
                             entrypquota.setUsage(used)
                             
@@ -824 +830 @@
         elif (options["add"] or options["prototype"]) and options["delete"] :    
             raise PyKotaToolError, _("incompatible options, see help.")
-        elif (options["softlimit"] or options["hardlimit"]) and options["prototype"] :    
+        elif (options["reset"] or options["hardreset"] or options["limitby"] or options["used"] or options["balance"] or options["overcharge"] or options["softlimit"] or options["hardlimit"]) and options["prototype"] :
             raise PyKotaToolError, _("incompatible options, see help.")
         elif options["noquota"] and (options["prototype"] or options["hardlimit"] or options["softlimit"]) :

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.21alpha27 :
+    
+        - epykota's --prototype option now works fine with accounts
+          limited by balance.
+          
     - 1.21alpha26 :
     

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.21alpha26_unofficial"
+__version__ = "1.21alpha27_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""

pykota/trunk/TODO

@@ -30 +30 @@
           
         - Allow soft and hard limits to be increased/decreased.
-        
-        - Better --prototype option in edpykota
         
         - Web enabled pykotme.