Changeset 917

Timestamp:

04/15/03 15:55:28 (22 years ago)

Author:

jalet

Message:

Options --limitby and --balance added to edpykota

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (10 diffs)
• NEWS (modified) (1 diff)
• pykota/storages/sql.py (modified) (2 diffs)

pykota/trunk/bin/edpykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.36  2003/04/15 13:55:28  jalet
+# Options --limitby and --balance added to edpykota
+#
 # Revision 1.35  2003/04/15 13:06:39  jalet
 # Allow to add a printer without any user
@@ -174 +177 @@
                        or group to zero. The life time page counter 
                        is kept unchanged.
+                       
+  -l | --limitby l     Choose if the user/group is limited in printing                     
+                       by its account balance or by its page quota.
+                       The default value is 'quota'. Allowed values
+                       are 'quota' and 'balance'.
+                       
+  -b | --balance b     Sets the user's account balance to b.                     
+                       Account balance may be increase or decreased
+                       if b is prefixed with + or -.
+                       WARNING : when decreasing account balance,
+                       the total paid so far by the user is decreased
+                       too.
+                       Groups don't have a real balance, but the
+                       sum of their users' account balance.
                        
   -S | --softlimit sl  Sets the quota soft limit to sl pages.                       
@@ -220 +237 @@
   accounting of the pages he prints will still be kept.
   Print Quotas for jerome on other printers are unchanged.
+  
+  $ edpykota --limitby balance jerome
+  
+  This will tell PyKota to limit jerome by his account's balance
+  when printing.
+  
+  $ edpykota --balance +10.0 jerome
+  
+  This will increase jerome's account balance by 10.0 (in your
+  own currency). You can decrease the account balance with a
+  dash prefix, and set it to a fixed amount with no prefix.
 
 This program is free software; you can redistribute it and/or modify
@@ -294 +322 @@
                 if softlimit is not None :
                     self.logger.log_message(_("Undefined soft limit set to hard limit (%s) on printer %s.") % (str(softlimit), printer))
-            if (not options["reset"] and not options["noquota"] and not options["prototype"]) and ((hardlimit is None) or (softlimit is None)) :
+            if (not options["reset"] and not options["noquota"] and not options["prototype"] and not options["limitby"] and not options["balance"]) and ((hardlimit is None) or (softlimit is None)) :
                 raise PyKotaToolError, _("Both hard and soft limits must be set ! Aborting.")
             if options["add"] :    
@@ -330 +358 @@
                     self.logger.log_message(_("Quota not found for object %s on printer %s.") % (name, printer))
                 else :    
+                    limitby = options["limitby"]
+                    if limitby :
+                        limitby = limitby.lower()
+                    if limitby and (limitby not in ('quota', 'balance')) :    
+                        limitby = 'quota'
                     if options["groups"] :
                         if options["noquota"] or options["prototype"] or ((softlimit is not None) and (hardlimit is not None)) :
@@ -335 +368 @@
                         if options["reset"] :
                             self.storage.resetGroupPQuota(ident, printerid)
+                        if limitby :
+                            self.storage.limitGroupBy(ident, limitby)
                         self.warnGroupPQuota(name, printer)    
                     else :
@@ -341 +376 @@
                         if options["reset"] :
                             self.storage.resetUserPQuota(ident, printerid)
+                        if limitby :
+                            self.storage.limitUserBy(ident, limitby)
+                        balance = options["balance"]    
+                        if balance :
+                            balance = balance.strip()
+                            try :
+                                balancevalue = float(balance)
+                            except ValueError :    
+                                pass # TODO : log something when incorrect balance value
+                            else :    
+                                if balance.startswith("+") or balance.startswith("-") :
+                                    self.storage.increaseUserBalance(ident, balancevalue)
+                                else :
+                                    self.storage.setUserBalance(ident, balancevalue)
                         self.warnUserPQuota(name, printer)    
                      
@@ -348 +397 @@
                      "printer" : "*", \
                    }
-        short_options = "vhnaugrp:P:S:H:"
-        long_options = ["help", "version", "noquota", "add", "users", "groups", "reset", "prototype=", "printer=", "softlimit=", "hardlimit="]
+        short_options = "vhl:b:naugrp:P:S:H:"
+        long_options = ["help", "version", "limitby=", "balance=", "noquota", "add", "users", "groups", "reset", "prototype=", "printer=", "softlimit=", "hardlimit="]
         
         # Initializes the command line tool
@@ -369 +418 @@
         options["reset"] = options["r"] or options["reset"] 
         options["noquota"] = options["n"] or options["noquota"]
+        options["limitby"] = options["l"] or options["limitby"]
+        options["balance"] = options["b"] or options["balance"] 
         
         if options["help"] :
@@ -380 +431 @@
         elif options["noquota"] and (options["prototype"] or options["hardlimit"] or options["softlimit"]) :
             raise PyKotaToolError, _("incompatible options, see help.")
+        elif options["groups"] and options["balance"] :
+            raise PyKotaToolError, _("incompatible options, see help.")
         elif options["groups"] :    
             raise PyKotaToolError, _("option --groups is currently not implemented.")

pykota/trunk/NEWS

@@ -32 +32 @@
           jobs as well as charge users per page and/or per job, 
           and track users' account balance.
+          
+        - edpykota now accepts much more command line options to  
+          use the new functionnalities. See edpykota --help for
+          details.
           
         - The installation script now allows to install the sample

pykota/trunk/pykota/storages/sql.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.24  2003/04/15 13:55:28  jalet
+# Options --limitby and --balance added to edpykota
+#
 # Revision 1.23  2003/04/15 11:30:57  jalet
 # More work done on money print charging.
@@ -232 +235 @@
         self.increaseUserBalance(userid, difference)
         
-    def limitUserByQuota(self, userid) :    
-        """Limits a given user based on print quota."""
-        self.doQuery("UPDATE users SET limitby='quota' WHERE id=%s" % self.doQuote(userid))
-        
-    def limitUserByBalance(self, userid) :    
-        """Limits a given user based on account balance."""
-        self.doQuery("UPDATE users SET limitby='balance' WHERE id=%s" % self.doQuote(userid))
+    def limitUserBy(self, userid, limitby) :    
+        """Limits a given user based either on print quota or on account balance."""
+        self.doQuery("UPDATE users SET limitby=%s WHERE id=%s" % (self.doQuote(limitby), self.doQuote(userid)))
+        
+    def limitGroupBy(self, groupid, limitby) :    
+        """Limits a given group based either on print quota or on sum of its users' account balances."""
+        self.doQuery("UPDATE groups SET limitby=%s WHERE id=%s" % (self.doQuote(limitby), self.doQuote(groupid)))
         
     def setUserPQuota(self, userid, printerid, softlimit, hardlimit) :