Changeset 2054 for pykota/trunk/pykota/tool.py

Timestamp:

02/13/05 23:02:29 (19 years ago)

Author:

jalet

Message:

Big database structure changes. Upgrade script is now included as well as
the new LDAP schema.
Introduction of the -o | --overcharge command line option to edpykota.
The output of repykota is more complete, but doesn't fit in 80 columns anymore.
Introduction of the new 'maxdenybanners' directive.

Files:

• pykota/trunk/pykota/tool.py (modified) (5 diffs)

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.149  2005/02/13 22:02:29  jalet
+# Big database structure changes. Upgrade script is now included as well as
+# the new LDAP schema.
+# Introduction of the -o | --overcharge command line option to edpykota.
+# The output of repykota is more complete, but doesn't fit in 80 columns anymore.
+# Introduction of the new 'maxdenybanners' directive.
+#
 # Revision 1.148  2005/01/06 23:24:21  jalet
 # Regain priviledge the time to open the job's data file when printing in
@@ -1012 +1019 @@
                 return action        
             else :    
-                val = float(user.AccountBalance or 0.0)
-                enforcement = self.config.getPrinterEnforcement(printer.Name)
-                if enforcement == "STRICT" : 
-                    val -= self.softwareJobPrice # use precomputed size.
-                if val <= 0.0 :
-                    action = "DENY"
-                elif val <= self.config.getPoorMan() :    
-                    action = "WARN"
+                if user.OverCharge == 0.0 :
+                    self.printInfo(_("User %s will not be charged for printing.") % user.Name)
+                    action = "ALLOW"
                 else :
-                    action = "ALLOW"
-                if (enforcement == "STRICT") and (val == 0.0) :
-                    action = "WARN" # we can still print until account is 0
+                    val = float(user.AccountBalance or 0.0)
+                    enforcement = self.config.getPrinterEnforcement(printer.Name)
+                    if enforcement == "STRICT" : 
+                        val -= self.softwareJobPrice # use precomputed size.
+                    if val <= 0.0 :
+                        action = "DENY"
+                    elif val <= self.config.getPoorMan() :    
+                        action = "WARN"
+                    else :
+                        action = "ALLOW"
+                    if (enforcement == "STRICT") and (val == 0.0) :
+                        action = "WARN" # we can still print until account is 0
                 return action    
         else :
@@ -1106 +1117 @@
         if action.startswith("POLICY_") :
             action = action[7:]
+            
         if action == "DENY" :
             adminmessage = _("Print Quota exceeded for user %s on printer %s") % (user.Name, printer.Name)
@@ -1286 +1298 @@
     def exportUserInfo(self, userpquota) :
         """Exports user information to the environment."""
+        os.environ["PYKOTAOVERCHARGE"] = str(userpquota.User.OverCharge)
         os.environ["PYKOTALIMITBY"] = str(userpquota.User.LimitBy)
         os.environ["PYKOTABALANCE"] = str(userpquota.User.AccountBalance or 0.0)
@@ -1294 +1307 @@
         os.environ["PYKOTAHARDLIMIT"] = str(userpquota.HardLimit)
         os.environ["PYKOTADATELIMIT"] = str(userpquota.DateLimit)
+        os.environ["PYKOTAWARNCOUNT"] = str(userpquota.WarnCount)
         
         # not really an user information, but anyway