Changeset 2054

Timestamp:

02/13/05 23:02:29 (20 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.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (6 diffs)
• bin/edpykota (modified) (8 diffs)
• conf/pykota.conf.sample (modified) (2 diffs)
• FAQ (modified) (2 diffs)
• initscripts/ldap/pykota.schema (modified) (2 diffs)
• initscripts/postgresql/pykota-postgresql.sql (modified) (6 diffs)
• initscripts/postgresql/README.postgresql (modified) (1 diff)
• NEWS (modified) (1 diff)
• po/fr_FR/pykota.mo (modified) (previous)
• po/fr_FR/pykota.po (modified) (2 diffs)
• po/zh_TW/pykota.mo (modified) (previous)
• po/zh_TW/pykota.po (modified) (29 diffs)
• pykota/config.py (modified) (2 diffs)
• pykota/reporter.py (modified) (4 diffs)
• pykota/reporters/html.py (modified) (4 diffs)
• pykota/reporters/text.py (modified) (3 diffs)
• pykota/storage.py (modified) (10 diffs)
• pykota/storages/ldapstorage.py (modified) (17 diffs)
• pykota/storages/sql.py (modified) (13 diffs)
• pykota/tool.py (modified) (5 diffs)
• pykota/version.py (modified) (1 diff)
• README (modified) (3 diffs)
• TODO (modified) (3 diffs)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.85  2005/02/13 22:02:28  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.84  2005/01/17 08:44:23  jalet
 # Modified copyright years
@@ -501 +508 @@
             accountbanner = self.config.getAccountBanner(printer.Name)
             if accountbanner in ["ENDING", "NONE"] :
-                banner = self.startingBanner(printer.Name)
-                if banner :
-                    self.logdebug("Printing starting banner before accounting begins.")
-                    self.handleData(banner)
+                if (action == 'DENY') and (userpquota.WarnCount < self.config.getMaxDenyBanners()) :
+                    self.printInfo(_("Banner won't be printed : maximum number of deny banners reached."), "warn")
+                else :
+                    if action == 'DENY' :
+                        userpquota.warn() # increments the warning counter
+                        self.exportUserInfo(userpquota)
+                    banner = self.startingBanner(printer.Name)
+                    if banner :
+                        self.logdebug("Printing starting banner before accounting begins.")
+                        self.handleData(banner)
  
             self.printMoreInfo(user, printer, _("Job accounting begins."))
@@ -511 +524 @@
             # handle starting banner pages during accounting
             if accountbanner in ["STARTING", "BOTH"] :
-                banner = self.startingBanner(printer.Name)
-                if banner :
-                    self.logdebug("Printing starting banner during accounting.")
-                    self.handleData(banner)
-                    if self.accounter.isSoftware :
-                        bannersize += 1 # TODO : fix this by passing the banner's content through PDLAnalyzer
+                if (action == 'DENY') and (userpquota.WarnCount < self.config.getMaxDenyBanners()) :
+                    self.printInfo(_("Banner won't be printed : maximum number of deny banners reached."), "warn")
+                else :
+                    if action == 'DENY' :
+                        userpquota.warn() # increments the warning counter
+                        self.exportUserInfo(userpquota)
+                    banner = self.startingBanner(printer.Name)
+                    if banner :
+                        self.logdebug("Printing starting banner during accounting.")
+                        self.handleData(banner)
+                        if self.accounter.isSoftware :
+                            bannersize += 1 # TODO : fix this by passing the banner's content through PDLAnalyzer
         else :    
             action = "ALLOW"
@@ -536 +555 @@
             # handle ending banner pages during accounting
             if accountbanner in ["ENDING", "BOTH"] :
-                banner = self.endingBanner(printer.Name)
-                if banner :
-                    self.logdebug("Printing ending banner during accounting.")
-                    self.handleData(banner)
-                    if self.accounter.isSoftware :
-                        bannersize += 1 # TODO : fix this by passing the banner's content through PDLAnalyzer
+                if (action == 'DENY') and (userpquota.WarnCount < self.config.getMaxDenyBanners()) :
+                    self.printInfo(_("Banner won't be printed : maximum number of deny banners reached."), "warn")
+                else :
+                    if action == 'DENY' :
+                        userpquota.warn() # increments the warning counter
+                        self.exportUserInfo(userpquota)
+                    banner = self.endingBanner(printer.Name)
+                    if banner :
+                        self.logdebug("Printing ending banner during accounting.")
+                        self.handleData(banner)
+                        if self.accounter.isSoftware :
+                            bannersize += 1 # TODO : fix this by passing the banner's content through PDLAnalyzer
  
             # stops accounting. 
@@ -575 +600 @@
             # handle ending banner pages after accounting ends
             if accountbanner in ["STARTING", "NONE"] :
-                banner = self.endingBanner(printer.Name)
-                if banner :
-                    self.logdebug("Printing ending banner after accounting ends.")
-                    self.handleData(banner)
-            
+                if (action == 'DENY') and (userpquota.WarnCount < self.config.getMaxDenyBanners()) :
+                    self.printInfo(_("Banner won't be printed : maximum number of deny banners reached."), "warn")
+                else :
+                    if action == 'DENY' :
+                        userpquota.warn() # increments the warning counter
+                        self.exportUserInfo(userpquota)
+                    banner = self.endingBanner(printer.Name)
+                    if banner :
+                        self.logdebug("Printing ending banner after accounting ends.")
+                        self.handleData(banner)
+                        
             # Launches the post hook
             self.posthook(userpquota)
@@ -823 +854 @@
             try :
                 status = subprocess.wait()
-            except OSError : # already dead    
+            except OSError : # already dead : TODO : detect when abnormal
                 status = 0
         if os.WIFEXITED(status) :

pykota/trunk/bin/edpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.87  2005/02/13 22:02:28  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.86  2005/01/21 14:40:01  jalet
 # edpykota's --delete command line tool doesn't use "*" as its default argument
@@ -337 +344 @@
                        If both are to be set, separate them with a comma.
                        Floating point values are allowed.
+                       
+  -o | --overcharge f  Sets the overcharging factor applied to the user 
+                       when computing the cost of a print job. Positive or 
+                       negative floating point values are allowed,
+                       this allows you to do some really creative
+                       things like giving money to an user whenever
+                       he prints. The number of pages in a print job
+                       is not modified by this coefficient, only the
+                       cost of the job for a particular user.
+                       Only users have a coefficient.
   
   -i | --ingroups g1[,g2...]  Puts the users into each of the groups
@@ -480 +497 @@
   When printing either on hplj1 or hplj2, print quota will also be 
   checked and accounted for on virtual printers Laser and HP.
+  
+  $ edpykota --overcharge 2.5 poorstudent
+  
+  This will overcharge the poorstudent user by a factor of 2.5.
+  
+  $ edpykota --overcharge -1 jerome
+  
+  User jerome will actually earn money whenever he prints.
+  
+  $ edpykota --overcharge 0 boss
+  
+  User boss can print at will, it won't cost him anything because the
+  cost of each print job will be multiplied by zero before charging
+  his account.
 
 This program is free software; you can redistribute it and/or modify
@@ -532 +563 @@
                 (softlimit, hardlimit) = (hardlimit, softlimit)
             
+        overcharge = options["overcharge"]
+        if overcharge :
+            try :
+                overcharge = float(overcharge.strip())
+            except (ValueError, AttributeError) :    
+                raise PyKotaToolError, _("Invalid overcharge value %s") % options["overcharge"]
+                
         balance = options["balance"]
         if balance :
@@ -710 +748 @@
                             entrypquota.setUsage(used)
                             
+                        if overcharge is not None :    
+                            if changed[entry.Name].get("overcharge") is None :
+                                entry.setOverChargeFactor(overcharge)
+                                changed[entry.Name]["overcharge"] = overcharge
+                                
                         if balance :
                             if changed[entry.Name].get("balance") is None :
@@ -742 +785 @@
                      "printer" : "*", \
                    }
-        short_options = "vhdc:l:b:i:naugrp:P:S:H:G:RU:"
-        long_options = ["help", "version", "charge=", "delete", "limitby=", "balance=", "ingroups=", "noquota", "add", "users", "groups", "reset", "hardreset", "prototype=", "printer=", "softlimit=", "hardlimit=", "pgroups=", "used="]
+        short_options = "vhdo:c:l:b:i:naugrp:P:S:H:G:RU:"
+        long_options = ["help", "version", "overcharge=", "charge=", "delete", "limitby=", "balance=", "ingroups=", "noquota", "add", "users", "groups", "reset", "hardreset", "prototype=", "printer=", "softlimit=", "hardlimit=", "pgroups=", "used="]
         
         # Initializes the command line tool
@@ -771 +814 @@
         options["hardreset"] = options["R"] or options["hardreset"] 
         options["used"] = options["U"] or options["used"]
+        options["overcharge"] = options["o"] or options["overcharge"]
         
         if options["help"] :
@@ -784 +828 @@
         elif options["noquota"] and (options["prototype"] or options["hardlimit"] or options["softlimit"]) :
             raise PyKotaToolError, _("incompatible options, see help.")
-        elif options["groups"] and (options["balance"] or options["ingroups"] or options["used"]) :
+        elif options["groups"] and (options["balance"] or options["ingroups"] or options["used"] or options["overcharge"]) :
             raise PyKotaToolError, _("incompatible options, see help.")
         else :

pykota/trunk/conf/pykota.conf.sample

@@ -610 +610 @@
 #                         printers, or "localhost" if not defined or not
 #                         meaningful.
+# PYKOTAWARNCOUNT : the number of times the user was forbidden to print but a banner
+#                   page was still printed on the current printer.                   
+# PYKOTAOVERCHARGE : user's overcharging factor.
+#
 
 # PreHook : gets executed after being sure the user, printer and user quota
@@ -657 +661 @@
 # accountbanner: Both
 
+# Maximal number of times the banner will still be printed if
+# the user is forbidden to print.
+#
+# NB : CUPS ONLY FOR NOW !
+# 
+# This option can be set either globally or on a per printer basis.
+# Allowed values are 0 or any positive integer.
+# Default value is 0, which means that the banner won't be printed
+# at all if the user is forbidden to print.
+maxdenybanners: 0
+
 # StartingBanner : if defined will print a banner before the rest of the job 
 # is printed. The argument can be a printable file, or an executable file.

pykota/trunk/FAQ

@@ -19 +19 @@
     that all debug messages for PyKota will go to syslog's
     destination for the LPR syslog facility.
+    
+    IMPORTANT : please don't send log files to the mailing list
+    unless they are very small of unless someone asked for this.
   
   * How can I limit my users to N pages per day (month/year) ?
@@ -47 +50 @@
       use the --printer command line argument as well. See
       edpykota's documentation for details.
+      
+    Another way to do this when you limit your users by balance, is  
+    to set an overcharging factor of zero for every user you want to
+    print with no limitation :
+    
+      $ edpykota --add --limitby balance --overcharge 0 user1 user2 ...
   
   * Nothing prints when my printer is in PowerSave mode, what

pykota/trunk/initscripts/ldap/pykota.schema

@@ -187 +187 @@
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
         
-# pykotaUserCoefficient
-attributetype ( 1.3.6.1.4.1.16868.1.1.27 NAME 'pykotaUserCoefficient'
-        DESC 'Coefficient for a particular user, float'
+# pykotaOverCharge
+attributetype ( 1.3.6.1.4.1.16868.1.1.27 NAME 'pykotaOverCharge'
+        DESC 'OverCharging factor for a particular user, float'
         EQUALITY caseIgnoreIA5Match
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
@@ -270 +270 @@
 objectclass ( 1.3.6.1.4.1.16868.1.2.7 NAME 'pykotaAccountBalance' SUP top AUXILIARY
         DESC 'PyKota User account balance'
-        MAY  ( pykotaUserName $ pykotaBalance $ pykotaLifeTimePaid $ pykotaUserCoefficient $ pykotaPayments ) )
+        MAY  ( pykotaUserName $ pykotaBalance $ pykotaLifeTimePaid $ pykotaOverCharge $ pykotaPayments ) )
         
 # pykotaLastJob        

pykota/trunk/initscripts/postgresql/pykota-postgresql.sql

@@ -20 +20 @@
 --
 -- $Log$
+-- Revision 1.16  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.15  2005/01/23 10:58:22  jalet
 -- Added a few indexes for the database
@@ -106 +113 @@
                    lifetimepaid FLOAT DEFAULT 0.0,
                    limitby TEXT DEFAULT 'quota',
-                   coefficient FLOAT NOT NULL DEFAULT 1.0);
+                   overcharge FLOAT NOT NULL DEFAULT 1.0);
                    
 --
@@ -135 +142 @@
                         hardlimit INT4,
                         datelimit TIMESTAMP,
-                        warned INT4 DEFAULT 0); -- not a boolean, will help stats
+                        warncount INT4 DEFAULT 0); 
 CREATE INDEX userpquota_u_id_ix ON userpquota (userid);
 CREATE INDEX userpquota_p_id_ix ON userpquota (printerid);
@@ -176 +183 @@
                          hardlimit INT4,
                          datelimit TIMESTAMP);
+CREATE INDEX grouppquota_g_id_ix ON grouppquota (groupid);
+CREATE INDEX grouppquota_p_id_ix ON grouppquota (printerid);
 CREATE UNIQUE INDEX grouppquota_up_id_ix ON grouppquota (groupid, printerid);
                         
@@ -206 +215 @@
                            printerid INTEGER NOT NULL REFERENCES printers(id), 
                            label TEXT NOT NULL, 
-                           coefficient FLOAT NOT NULL DEFAULT 1.0, 
+                           coefficient FLOAT DEFAULT 1.0, 
                            CONSTRAINT coeffconstraint UNIQUE (printerid, label));
 
@@ -212 +221 @@
 -- Set some ACLs                        
 --
-REVOKE ALL ON users, groups, printers, userpquota, grouppquota, groupsmembers, printergroupsmembers, jobhistory, payments FROM public;                        
-REVOKE ALL ON users_id_seq, groups_id_seq, printers_id_seq, userpquota_id_seq, grouppquota_id_seq, jobhistory_id_seq, payments_id_seq FROM public;
+REVOKE ALL ON users, groups, printers, userpquota, grouppquota, groupsmembers, printergroupsmembers, jobhistory, payments, coefficients FROM public;                        
+REVOKE ALL ON users_id_seq, groups_id_seq, printers_id_seq, userpquota_id_seq, grouppquota_id_seq, jobhistory_id_seq, payments_id_seq, coefficients_id_seq FROM public;
 
 GRANT SELECT, INSERT, UPDATE, DELETE, REFERENCES ON users, groups, printers, userpquota, grouppquota, groupsmembers, printergroupsmembers, jobhistory, payments, coefficients TO pykotaadmin;

pykota/trunk/initscripts/postgresql/README.postgresql

@@ -59 +59 @@
   version of PyKota.
   
+  * An SQL script to upgrade a 1.20 PyKota Storage DataBase to
+    1.21 is included. Launch it this way on the Quota Storage Server :
+    
+        $ psql -U postgres pykota
+        pykota=# \i upgrade-to-1.21.sql
+        pykota=# \q
+        $
+        
+    This script adds many fields to existing tables, and also adds
+    some tables in indexes.
+    
   * An SQL script to upgrade a 1.18 PyKota Storage DataBase to
     1.19 is included. Launch it this way on the Quota Storage Server :

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.21alpha24 :
+    
+        - Big database structure changes. An upgrade script
+          is now included for PostgreSQL. LDAP users may just
+          want to copy the new schema in place.
+          
+        - edpykota now recognizes the -o | --overcharge command line
+          option to set an overcharging or undercharging factor
+          on each print job's cost for a particular user.
+          
+        - repykota's output format has changed an is not limited to  
+          80 characters wide anymore. People who used to parse 
+          repykota's output in their own tools are strongly advised
+          to parse dumpykota's output instead.
+          
+        - Introduction of the new 'maxdenybanners' configuration directive
+          to allow up to N (the directive's value) deny banners to be
+          printed even if the print account is forbidden to print.
+          
+        - Better detection of the number of copies in the PostScript parser.
+        
     - 1.21alpha23 :
     

pykota/trunk/po/fr_FR/pykota.po

@@ -1120 +1120 @@
 msgid "Invalid modifier [%s] for --data command line option, see help."
 msgstr ""
-"Le modifier [%s] pour l'option de ligne de commande --data est invalide, "
+"Le modificateur [%s] pour l'option de ligne de commande --data est invalide, "
 "voir l'aide."
 
@@ -1126 +1126 @@
 msgid "Invalid modifier [%s] for --format command line option, see help."
 msgstr ""
-"Le modifier [%s] pour l'option de ligne de commande --format est invalide, "
-"voir l'aide."
+"Le modificateur [%s] pour l'option de ligne de commande --format est "
+"invalide, voir l'aide."
 
 msgid "XML output is disabled because the jaxml module is not available."

pykota/trunk/po/zh_TW/pykota.po

@@ -28 +28 @@
 "Project-Id-Version: PyKota v1.20\n"
 "Report-Msgid-Bugs-To: alet@librelogiciel.com\n"
-"POT-Creation-Date: 2005-01-25 09:03+0800\n"
+"POT-Creation-Date: 2004-11-25 10:16+0100\n"
 "PO-Revision-Date: 2005-01-25 09:03+0800\n"
 "Last-Translator: Tsang Yu Pong, Teddy, Wing Kwong College in Hong Kong,"
@@ -39 +39 @@
 #, python-format
 msgid ""
-"pkbanner v%s (c) 2003, 2004, 2005 C@LL - Conseil Internet & Logiciels Libres\n"
+"pkbanner v%s (c) 2003, 2004, 2005 C@LL - Conseil Internet & Logiciels "
+"Libres\n"
 "\n"
 "Generates banners.\n"
@@ -292 +293 @@
 #, python-format
 msgid ""
-"pkprinters v%s (c) 2003, 2004, 2005 C@LL - Conseil Internet & Logiciels Libres\n"
+"pkprinters v%s (c) 2003, 2004, 2005 C@LL - Conseil Internet & Logiciels "
+"Libres\n"
 "A Printers Manager for PyKota.\n"
 "\n"
@@ -360 +362 @@
 "  $ pkprinters --delete \"*\"\n"
 "  \n"
-"This will completely delete all printers and associated quota "
+"  This will completely delete all printers and associated quota "
 "information,\n"
 "  as well as their job history. USE WITH CARE !\n"
@@ -589 +591 @@
 #, python-format
 msgid ""
-"autopykota v%s (c) 2003, 2004, 2005 C@LL - Conseil Internet & Logiciels Libres\n"
+"autopykota v%s (c) 2003, 2004, 2005 C@LL - Conseil Internet & Logiciels "
+"Libres\n"
 "A tool to automate user account creation and initial balance setting.\n"
 "\n"
@@ -664 +667 @@
 #, python-format
 msgid ""
-"dumpykota v%s (c) 2003, 2004, 2005 C@LL - Conseil Internet & Logiciels Libres\n"
+"dumpykota v%s (c) 2003, 2004, 2005 C@LL - Conseil Internet & Logiciels "
+"Libres\n"
 "\n"
 "Dumps PyKota database's content.\n"
@@ -757 +761 @@
 #, python-format
 msgid ""
-"edpykota v%s (c) 2003, 2004, 2005 C@LL - Conseil Internet & Logiciels Libres\n"
+"edpykota v%s (c) 2003, 2004, 2005 C@LL - Conseil Internet & Logiciels "
+"Libres\n"
 "A Print Quota editor for PyKota.\n"
 "\n"
@@ -1014 +1019 @@
 #, python-format
 msgid ""
-"repykota v%s (c) 2003, 2004, 2005 C@LL - Conseil Internet & Logiciels Libres\n"
+"repykota v%s (c) 2003, 2004, 2005 C@LL - Conseil Internet & Logiciels "
+"Libres\n"
 "\n"
 "Generates print quota reports.\n"
@@ -1078 +1084 @@
 #, python-format
 msgid ""
-"warnpykota v%s (c) 2003, 2004, 2005 C@LL - Conseil Internet & Logiciels Libres\n"
+"warnpykota v%s (c) 2003, 2004, 2005 C@LL - Conseil Internet & Logiciels "
+"Libres\n"
 "\n"
 "Sends mail to users over print quota.\n"
@@ -1255 +1262 @@
 "paid"
 msgstr ""
-"群組           已列印    警告限制    有效限制    結餘 寬限日期        付款總計       "
-"已繳付"
-
+"群組           已列印    警告限制    有效限制    結餘 寬限日期        付款總"
+"計       已繳付"
 
 msgid ""
@@ -1263 +1269 @@
 "paid"
 msgstr ""
-"群組           已列印    警告限制    有效限制    結餘 寬限日期         付款總計       "
-"已繳付"
+"群組           已列印    警告限制    有效限制    結餘 寬限日期         付款總"
+"計       已繳付"
 
 msgid "unknown"
@@ -1314 +1320 @@
 "Unable to find user %s's account balance, applying default policy (%s) for "
 "printer %s"
-msgstr ""
-"未能尋找使用者 %s 的帳目結算，因此採用預設的政策(%s)於"
-"列印機 %s"
+msgstr "未能尋找使用者 %s 的帳目結算，因此採用預設的政策(%s)於列印機 %s"
 
 #, python-format
@@ -1336 +1340 @@
 msgstr "使用者 %s 的列印配額於列印機 %s 經已超出配額"
 
-#, python
-
 #, python-format
 msgid "Print Quota low for user %s on printer %s"
@@ -1345 +1347 @@
 msgstr "列印配額經已很低"
 
-
 #, python-format
 msgid "Printing system %s, args=%s"
@@ -1374 +1375 @@
 "s) for printer %s"
 msgstr ""
-"列印機 %s 在PyKota系統內沒有登記，因此這台列印機"
-"套用external policy (%s) "
+"列印機 %s 在PyKota系統內沒有登記，因此這台列印機套用external policy (%s) "
 
 #, python-format
@@ -1382 +1382 @@
 "for printer %s"
 msgstr ""
-"使用者 %s 在PyKota內沒有登記，因此這個使用者將會套用external policy(%s) "
-"於列印機 %s "
+"使用者 %s 在PyKota內沒有登記，因此這個使用者將會套用external policy(%s) 於列"
+"印機 %s "
 
 #, python-format
@@ -1389 +1389 @@
 "User %s doesn't have quota on printer %s in the PyKota system, applying "
 "external policy (%s) for printer %s"
-msgstr ""
-"使用者沒有列印配額於列印機 %s ，套用對外政策 (%s)"
-" 於列印機 %s"
+msgstr "使用者沒有列印配額於列印機 %s ，套用對外政策 (%s) 於列印機 %s"
 
 #, python-format
@@ -1397 +1395 @@
 "External policy %s for printer %s produced an error. Job rejected. Please "
 "check PyKota's configuration files."
-msgstr ""
-"對外政策 %s 於列印機 %s 產生錯誤，列印工作被拒，請撿查PyKota的設定檔案"
+msgstr "對外政策 %s 於列印機 %s 產生錯誤，列印工作被拒，請撿查PyKota的設定檔案"
 
 #, python-format
 msgid ""
 "Printer %s not registered in the PyKota system, applying default policy (%s)"
-msgstr ""
-"列印機 %s 沒有於PyKota系統內登記，套用預設的政策 (%s)"
+msgstr "列印機 %s 沒有於PyKota系統內登記，套用預設的政策 (%s)"
 
 #, python-format
@@ -1410 +1406 @@
 "User %s not registered in the PyKota system, applying default policy (%s) "
 "for printer %s"
-msgstr ""
-"使用者 %s 沒有於PyKota系統內登記，套用預設的政策 (%s)"
-"於列印機 %s"
+msgstr "使用者 %s 沒有於PyKota系統內登記，套用預設的政策 (%s)於列印機 %s"
 
 #, python-format
@@ -1418 +1412 @@
 "User %s doesn't have quota on printer %s in the PyKota system, applying "
 "default policy (%s)"
-msgstr ""
-"使用者 %s 沒有列印配額於列印機 %s，套用預設的政策 (%s)"
+msgstr "使用者 %s 沒有列印配額於列印機 %s，套用預設的政策 (%s)"
 
 #, python-format
 msgid ""
 "Printer %s still not registered in the PyKota system, job will be rejected"
-msgstr ""
-"列印機 %s 依然沒有於PyKota系統內登記，列印工作要求被拒"
+msgstr "列印機 %s 依然沒有於PyKota系統內登記，列印工作要求被拒"
 
 #, python-format
@@ -1431 +1423 @@
 "User %s still not registered in the PyKota system, job will be rejected on "
 "printer %s"
-msgstr ""
-"使用者 %s 依然沒有於PyKota系統內登記，列印工作要求被拒於"
-"列印機 %s"
+msgstr "使用者 %s 依然沒有於PyKota系統內登記，列印工作要求被拒於列印機 %s"
 
 #, python-format
@@ -1439 +1429 @@
 "User %s still doesn't have quota on printer %s in the PyKota system, job "
 "will be rejected"
-msgstr ""
-"使用者 %s 依然沒有列印配額於列印機 %s 在PyKota系統，列印工作被拒"
+msgstr "使用者 %s 依然沒有列印配額於列印機 %s 在PyKota系統，列印工作被拒"
 
 #, python-format
@@ -1482 +1471 @@
 "Couldn't retrieve printer %s's internal page counter either before or after "
 "printing."
-msgstr ""
-"不能恢復列印機 %s 的內存頁面計算器不論在列印的之前或之後"
+msgstr "不能恢復列印機 %s 的內存頁面計算器不論在列印的之前或之後"
 
 #, python-format
@@ -1501 +1489 @@
 "download it from http://pysnmp.sourceforge.net"
 msgstr ""
-"要求內存的SNMP計算器，但找不到Python-SNMP"
-"請到http://pysnmp.sourceforge.net下載"
+"要求內存的SNMP計算器，但找不到Python-SNMP請到http://pysnmp.sourceforge.net下"
+"載"
 
 #, python-format
@@ -1532 +1520 @@
 "SNMP querying stage interrupted. Using latest value seen for internal page "
 "counter (%s) on printer %s."
-msgstr ""
-"SNMP查詢被中斷，使用最更新的數值來計算頁數"
-"計算器 (%s) 在列印機 %s 上"
+msgstr "SNMP查詢被中斷，使用最更新的數值來計算頁數計算器 (%s) 在列印機 %s 上"
 
 #, python-format
@@ -1540 +1526 @@
 "PJL querying stage interrupted. Using latest value seen for internal page "
 "counter (%s) on printer %s."
-msgstr ""
-"PJL查詢被中斷，使用最更新的數值來計算頁數"
-"計算器 (%s) 在列印機 %s 上"
+msgstr "PJL查詢被中斷，使用最更新的數值來計算頁數計算器 (%s) 在列印機 %s 上"
 
 #, python-format
@@ -1567 +1551 @@
 "Search base %s doesn't seem to exist. Probable misconfiguration. Please "
 "double check /etc/pykota/pykota.conf : %s"
-msgstr ""
-"%s 不存在，很可能是錯誤設定所致"
-"請撿查 /etc/pykota/pykota.conf : %s"
+msgstr "%s 不存在，很可能是錯誤設定所致請撿查 /etc/pykota/pykota.conf : %s"
 
 #, python-format
@@ -1591 +1573 @@
 "No pykotaAccountBalance object found for user %s. Did you create LDAP "
 "entries manually ?"
-msgstr "未能為使用者 %s 尋找pkotaAccountBalance object，請問你是否已手動建立LDAP 紀錄?  "
+msgstr ""
+"未能為使用者 %s 尋找pkotaAccountBalance object，請問你是否已手動建立LDAP 紀"
+"錄?  "
 
 #, python-format
@@ -1597 +1581 @@
 "Unable to find an existing objectClass %s entry with %s=%s to attach "
 "pykotaAccount objectClass"
-msgstr "未能尋找現存的objectclass %s 紀錄帶有 %s=%s"
-" 連繫到pykotaAccount objectClass "
+msgstr ""
+"未能尋找現存的objectclass %s 紀錄帶有 %s=%s 連繫到pykotaAccount objectClass "
 
 #, python-format

pykota/trunk/pykota/config.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.59  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.58  2004/12/02 22:01:58  jalet
 # TLS is now supported with the LDAP backend
@@ -507 +514 @@
             return (mailto, args)
         
+    def getMaxDenyBanners(self, printername) :    
+        """Returns the maximum number of deny banners to be printed for a particular user on a particular printer."""
+        try :
+            maxdb = self.getPrinterOption(printername, "maxdenybanners")
+        except PyKotaConfigError :    
+            return 0 # default value is to forbid printing a deny banner.
+        try :
+            value = int(maxdb.strip())
+            if value < 0 :
+                raise ValueError
+        except (TypeError, ValueError) :    
+            raise PyKotaConfigError, _("Invalid maximal deny banners counter %s") % maxdb
+        else :    
+            return value
+            
     def getGraceDelay(self, printername) :    
         """Returns the grace delay in days."""

pykota/trunk/pykota/reporter.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.11  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.10  2004/09/02 10:09:30  jalet
 # Fixed bug in LDAP user deletion code which didn't correctly delete the user's
@@ -87 +94 @@
     def getReportHeader(self) :        
         if self.isgroup :
-            return _("Group           used    soft    hard    balance grace         total       paid")
+            return _("Group          overcharge   used    soft    hard    balance grace         total       paid warn")
         else :    
-            return _("User            used    soft    hard    balance grace         total       paid")
+            return _("User           overcharge   used    soft    hard    balance grace         total       paid warn")
             
     def getPrinterRealPageCounter(self, printer) :        
@@ -109 +116 @@
         balance = float(entry.AccountBalance or 0.0)
         lifetimepaid = float(entry.LifeTimePaid or 0.0)
+        if not hasattr(entry, "OverCharge") :
+            overcharge = _("N/A")       # Not available for groups
+        else :    
+            overcharge = float(entry.OverCharge or 0.0)
+        if not hasattr(quota, "WarnCount") :    
+            warncount = _("N/A")        # Not available for groups
+        else :    
+            warncount = int(quota.WarnCount or 0)
         
         #balance
@@ -199 +214 @@
         strbalance = ("%5.2f" % balance)[:10]
         strlifetimepaid = ("%6.2f" % lifetimepaid)[:10]
-        return (lifepagecounter, lifetimepaid, entry.Name, reached, pagecounter, str(quota.SoftLimit), str(quota.HardLimit), strbalance, str(datelimit)[:10], lifepagecounter, strlifetimepaid)
+        strovercharge = ("%5s" % overcharge)[:5]
+        strwarncount = ("%4s" % warncount)[:4]
+        return (lifepagecounter, lifetimepaid, entry.Name, reached, \
+                pagecounter, str(quota.SoftLimit), str(quota.HardLimit), \
+                strbalance, str(datelimit)[:10], lifepagecounter, \
+                strlifetimepaid, strovercharge, strwarncount)
         
 def openReporter(tool, reporttype, printers, ugnames, isgroup) :

pykota/trunk/pykota/reporters/html.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.9  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.8  2004/01/12 15:28:45  jalet
 # Now can output the user's history on several printers at the same time.
@@ -81 +88 @@
                 else :    
                     oddevenclass = "even"
-                (pages, money, name, reached, pagecounter, soft, hard, balance, datelimit, lifepagecounter, lifetimepaid) = self.getQuota(entry, entrypquota)
+                (pages, money, name, reached, pagecounter, soft, hard, balance, datelimit, lifepagecounter, lifetimepaid, overcharge, warncount) = self.getQuota(entry, entrypquota)
                 if datelimit :
                     if datelimit == "DENY" :
@@ -89 +96 @@
                 if (not self.tool.config.getDisableHistory()) and (not self.isgroup) :
                     name = '<a href="%s?username=%s&printername=%s&history=1">%s</a>' % (os.environ.get("SCRIPT_NAME", ""), name, printer.Name, name)
-                self.report.append('<tr class="%s">%s</tr>' % (oddevenclass, "".join(["<td>%s</td>" % h for h in (name, reached, pagecounter, soft, hard, balance, datelimit or "&nbsp;", lifepagecounter, lifetimepaid)])))
+                self.report.append('<tr class="%s">%s</tr>' % (oddevenclass, "".join(["<td>%s</td>" % h for h in (name, reached, overcharge, pagecounter, soft, hard, balance, datelimit or "&nbsp;", lifepagecounter, lifetimepaid, warncount)])))
                 total += pages
                 totalmoney += money
@@ -95 +102 @@
             if total or totalmoney :        
                 (tpage, tmoney) = self.getTotals(total, totalmoney)
-                self.report.append('<tr class="totals"><td colspan="7">&nbsp;</td><td align="right">%s</td><td align="right">%s</td></tr>' % (tpage, tmoney))
-            self.report.append('<tr class="realpagecounter"><td colspan="7">&nbsp;</td><td align="right">%s</td></tr>' % self.getPrinterRealPageCounter(printer))
+                self.report.append('<tr class="totals"><td colspan="8">&nbsp;</td><td align="right">%s</td><td align="right">%s</td><td>&nbsp;</td></tr>' % (tpage, tmoney))
+            self.report.append('<tr class="realpagecounter"><td colspan="8">&nbsp;</td><td align="right">%s</td><td>&nbsp;</td></tr>' % self.getPrinterRealPageCounter(printer))
             self.report.append('</table>')
         if self.isgroup :    

pykota/trunk/pykota/reporters/text.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.10  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.9  2004/01/08 14:10:33  jalet
 # Copyright year changed.
@@ -78 +85 @@
             self.report.append('-' * len(header))
             for (entry, entrypquota) in getattr(self.tool.storage, "getPrinter%ssAndQuotas" % prefix)(printer, self.ugnames) :
-                (pages, money, name, reached, pagecounter, soft, hard, balance, datelimit, lifepagecounter, lifetimepaid) = self.getQuota(entry, entrypquota)
-                self.report.append("%-9.9s %s %7i %7s %7s %10s %-10.10s %8i %10s" % (name, reached, pagecounter, soft, hard, balance, datelimit, lifepagecounter, lifetimepaid))
+                (pages, money, name, reached, pagecounter, soft, hard, balance, datelimit, lifepagecounter, lifetimepaid, overcharge, warncount) = self.getQuota(entry, entrypquota)
+                self.report.append("%-15.15s %s %5s %7i %7s %7s %10s %-10.10s %8i %10s %4s" % (name, reached, overcharge, pagecounter, soft, hard, balance, datelimit, lifepagecounter, lifetimepaid, warncount))
                 total += pages
                 totalmoney += money
@@ -85 +92 @@
             if total or totalmoney :        
                 (tpage, tmoney) = self.getTotals(total, totalmoney)
-                self.report.append((" " * 50) + tpage + tmoney)
-            self.report.append((" " * 51) + self.getPrinterRealPageCounter(printer))
+                self.report.append((" " * 62) + tpage + tmoney)
+            self.report.append((" " * 63) + self.getPrinterRealPageCounter(printer))
             self.report.append("")        
         if self.isgroup :    

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.68  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.67  2005/01/18 19:47:50  jalet
 # Big bug fix wrt the datelimit attribute
@@ -276 +283 @@
         self.LifeTimePaid = None
         self.Email = None
+        self.OverCharge = 1.0
         self.Payments = [] # TODO : maybe handle this smartly for SQL, for now just don't retrieve them
         
@@ -308 +316 @@
             self.LimitBy = limitby
         
+    def setOverChargeFactor(self, factor) :    
+        """Sets the user's overcharging coefficient."""
+        self.parent.writeUserOverCharge(self, factor)
+        self.OverCharge = factor
+        
     def delete(self) :    
         """Deletes an user from the Quota Storage."""
@@ -357 +370 @@
         self.PricePerJob = None
         self.Description = None
+        self.Coefficients = None
         
     def __getattr__(self, name) :    
@@ -424 +438 @@
         self.HardLimit = None
         self.DateLimit = None
+        self.WarnCount = None
         
     def __getattr__(self, name) :    
@@ -445 +460 @@
         self.HardLimit = hardlimit
         self.DateLimit = None
+        self.WarnCount = 0
         
     def setUsage(self, used) :
@@ -454 +470 @@
                 self.parent.increaseUserPQuotaPagesCounters(self, vused)
                 self.parent.writeUserPQuotaDateLimit(self, None)
+                self.parent.writeUserPQuotaWarnCount(self, 0)
             except PyKotaStorageError, msg :    
                 self.parent.rollbackTransaction()
@@ -465 +482 @@
             self.PageCounter = self.LifePageCounter = vused
         self.DateLimit = None
+        self.WarnCount = 0
 
+    def warn(self) :
+        """Increases the warn counter for this user quota."""
+        self.parent.increaseUserPQuotaWarnCount(self)
+        self.WarnCount = (self.WarnCount or 0) + 1
+        
     def reset(self) :    
         """Resets page counter to 0."""
@@ -482 +505 @@
         totalprice = 0.0    
         if jobsize :
-            for upq in [ self ] + self.ParentPrintersUserPQuota :
-                price = (float(upq.Printer.PricePerPage or 0.0) * jobsize) + float(upq.Printer.PricePerJob or 0.0)
-                totalprice += price
-        return totalprice    
+            if self.User.OverCharge != 0.0 :    # optimization, but TODO : beware of rounding errors
+                for upq in [ self ] + self.ParentPrintersUserPQuota :
+                    price = (float(upq.Printer.PricePerPage or 0.0) * jobsize) + float(upq.Printer.PricePerJob or 0.0)
+                    totalprice += price
+        if self.User.OverCharge != 1.0 : # TODO : beware of rounding errors
+            overcharged = totalprice * self.User.OverCharge        
+            self.parent.tool.printInfo("Overcharging %s by a factor of %s ===> User %s will be charged for %s units." % (totalprice, self.User.OverCharge, self.User.Name, overcharged))
+            return overcharged
+        else :    
+            return totalprice
             
     def increasePagesUsage(self, jobsize) :
@@ -589 +618 @@
         self.JobOptions = None
         self.JobHostName = None
+        self.JobMD5Sum = None
+        self.JobPages = None
+        self.JobBillingCode = None
         
     def __getattr__(self, name) :    

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.100  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.99  2005/01/24 17:44:17  jalet
 # Same fix for group print quota entries wrt LDAP performance
@@ -647 +654 @@
         """Extracts user information given its name."""
         user = StorageUser(self, username)
-        result = self.doSearch("(&(objectClass=pykotaAccount)(|(pykotaUserName=%s)(%s=%s)))" % (username, self.info["userrdn"], username), ["pykotaUserName", "pykotaLimitBy", self.info["usermail"]], base=self.info["userbase"])
+        result = self.doSearch("(&(objectClass=pykotaAccount)(|(pykotaUserName=%s)(%s=%s)))" % (username, self.info["userrdn"], username), ["pykotaUserName", "pykotaLimitBy", self.info["usermail"], "pykotaOverCharge"], base=self.info["userbase"])
         if result :
             fields = result[0][1]
             user.ident = result[0][0]
             user.Name = fields.get("pykotaUserName", [username])[0] 
-            user.Email = fields.get(self.info["usermail"])
-            if user.Email is not None :
-                user.Email = user.Email[0]
-            user.LimitBy = fields.get("pykotaLimitBy")
-            if user.LimitBy is not None :
-                user.LimitBy = user.LimitBy[0]
-            else :    
-                user.LimitBy = "quota"
+            user.Email = fields.get(self.info["usermail"], [None])[0]
+            user.LimitBy = fields.get("pykotaLimitBy", ["quota"])[0]
+            user.OverCharge = float(fields.get("pykotaOverCharge", [1.0])[0])
             result = self.doSearch("(&(objectClass=pykotaAccountBalance)(|(pykotaUserName=%s)(%s=%s)))" % (username, self.info["balancerdn"], username), ["pykotaBalance", "pykotaLifeTimePaid", "pykotaPayments"], base=self.info["balancebase"])
             if not result :
@@ -695 +697 @@
             group.ident = result[0][0]
             group.Name = fields.get("pykotaGroupName", [groupname])[0] 
-            group.LimitBy = fields.get("pykotaLimitBy")
-            if group.LimitBy is not None :
-                group.LimitBy = group.LimitBy[0]
-            else :    
-                group.LimitBy = "quota"
+            group.LimitBy = fields.get("pykotaLimitBy", ["quota"])[0]
             group.AccountBalance = 0.0
             group.LifeTimePaid = 0.0
@@ -717 +715 @@
             printer.ident = result[0][0]
             printer.Name = fields.get("pykotaPrinterName", [printername])[0] 
-            printer.PricePerJob = float(fields.get("pykotaPricePerJob", [0.0])[0] or 0.0)
-            printer.PricePerPage = float(fields.get("pykotaPricePerPage", [0.0])[0] or 0.0)
+            printer.PricePerJob = float(fields.get("pykotaPricePerJob", [0.0])[0])
+            printer.PricePerPage = float(fields.get("pykotaPricePerPage", [0.0])[0])
             printer.uniqueMember = fields.get("uniqueMember", [])
             printer.Description = self.databaseToUserCharset(fields.get("description", [""])[0]) 
@@ -732 +730 @@
             else :    
                 base = self.info["userquotabase"]
-            result = self.doSearch("(&(objectClass=pykotaUserPQuota)(pykotaUserName=%s)(pykotaPrinterName=%s))" % (user.Name, printer.Name), ["pykotaPageCounter", "pykotaLifePageCounter", "pykotaSoftLimit", "pykotaHardLimit", "pykotaDateLimit"], base=base)
+            result = self.doSearch("(&(objectClass=pykotaUserPQuota)(pykotaUserName=%s)(pykotaPrinterName=%s))" % (user.Name, printer.Name), ["pykotaPageCounter", "pykotaLifePageCounter", "pykotaSoftLimit", "pykotaHardLimit", "pykotaDateLimit", "pykotaWarnCount"], base=base)
             if result :
                 fields = result[0][1]
                 userpquota.ident = result[0][0]
-                userpquota.PageCounter = int(fields.get("pykotaPageCounter", [0])[0] or 0)
-                userpquota.LifePageCounter = int(fields.get("pykotaLifePageCounter", [0])[0] or 0)
+                userpquota.PageCounter = int(fields.get("pykotaPageCounter", [0])[0])
+                userpquota.LifePageCounter = int(fields.get("pykotaLifePageCounter", [0])[0])
+                userpquota.WarnCount = int(fields.get("pykotaWarnCount", [0])[0])
                 userpquota.SoftLimit = fields.get("pykotaSoftLimit")
                 if userpquota.SoftLimit is not None :
@@ -815 +814 @@
             result = None
             try :
-                result = self.doSearch("objectClass=pykotaJob", ["pykotaJobSizeBytes", "pykotaHostName", "pykotaUserName", "pykotaJobId", "pykotaPrinterPageCounter", "pykotaJobSize", "pykotaAction", "pykotaJobPrice", "pykotaFileName", "pykotaTitle", "pykotaCopies", "pykotaOptions", "createTimestamp"], base="cn=%s,%s" % (lastjobident, self.info["jobbase"]), scope=ldap.SCOPE_BASE)
+                result = self.doSearch("objectClass=pykotaJob", ["pykotaJobSizeBytes", "pykotaHostName", "pykotaUserName", "pykotaJobId", "pykotaPrinterPageCounter", "pykotaJobSize", "pykotaAction", "pykotaJobPrice", "pykotaFileName", "pykotaTitle", "pykotaCopies", "pykotaOptions", "pykotaBillingCode", "pykotaPages", "pykotaMD5Sum", "createTimestamp"], base="cn=%s,%s" % (lastjobident, self.info["jobbase"]), scope=ldap.SCOPE_BASE)
             except PyKotaStorageError :    
                 pass # Last job entry exists, but job probably doesn't exist anymore. 
@@ -823 +822 @@
                 lastjob.JobId = fields.get("pykotaJobId")[0]
                 lastjob.UserName = fields.get("pykotaUserName")[0]
-                lastjob.PrinterPageCounter = int(fields.get("pykotaPrinterPageCounter", [0])[0] or 0)
+                lastjob.PrinterPageCounter = int(fields.get("pykotaPrinterPageCounter", [0])[0])
                 try :
                     lastjob.JobSize = int(fields.get("pykotaJobSize", [0])[0])
@@ -839 +838 @@
                 lastjob.JobHostName = fields.get("pykotaHostName", [""])[0]
                 lastjob.JobSizeBytes = fields.get("pykotaJobSizeBytes", [0L])[0]
+                lastjob.JobBillingCode = fields.get("pykotaMD5Sum", [None])[0]
+                lastjob.JobMD5Sum = fields.get("pykotaMD5Sum", [None])[0]
+                lastjob.JobPages = fields.get("pykotaPages", [""])[0]
                 date = fields.get("createTimestamp", ["19700101000000"])[0]
                 year = int(date[:4])
@@ -924 +926 @@
         else :
            base = self.info["userquotabase"]
-        result = self.doSearch("(&(objectClass=pykotaUserPQuota)(pykotaPrinterName=%s)(|%s))" % (printer.Name, "".join(["(pykotaUserName=%s)" % uname for uname in names])), ["pykotaUserName", "pykotaPageCounter", "pykotaLifePageCounter", "pykotaSoftLimit", "pykotaHardLimit", "pykotaDateLimit"], base=base)
+        result = self.doSearch("(&(objectClass=pykotaUserPQuota)(pykotaPrinterName=%s)(|%s))" % (printer.Name, "".join(["(pykotaUserName=%s)" % uname for uname in names])), ["pykotaUserName", "pykotaPageCounter", "pykotaLifePageCounter", "pykotaSoftLimit", "pykotaHardLimit", "pykotaDateLimit", "pykotaWarnCount"], base=base)
         if result :
             for (userquotaid, fields) in result :
@@ -930 +932 @@
                 userpquota = StorageUserPQuota(self, user, printer)
                 userpquota.ident = userquotaid
-                userpquota.PageCounter = int(fields.get("pykotaPageCounter", [0])[0] or 0)
-                userpquota.LifePageCounter = int(fields.get("pykotaLifePageCounter", [0])[0] or 0)
+                userpquota.PageCounter = int(fields.get("pykotaPageCounter", [0])[0])
+                userpquota.LifePageCounter = int(fields.get("pykotaLifePageCounter", [0])[0])
+                userpquota.WarnCount = int(fields.get("pykotaWarnCount", [0])[0])
                 userpquota.SoftLimit = fields.get("pykotaSoftLimit")
                 if userpquota.SoftLimit is not None :
@@ -990 +993 @@
                        "pykotaUserName" : user.Name,
                        "pykotaLimitBy" : (user.LimitBy or "quota"),
+                       "pykotaOverCharge" : str(user.OverCharge),
                     }   
                        
@@ -1048 +1052 @@
         newfields = { 
                       "pykotaGroupName" : group.Name,
-                      "pykotaLimitBY" : (group.LimitBy or "quota"),
+                      "pykotaLimitBy" : (group.LimitBy or "quota"),
                     } 
         mustadd = 1
@@ -1102 +1106 @@
                    "pykotaPageCounter" : "0",
                    "pykotaLifePageCounter" : "0",
+                   "pykotaWarnCount" : "0",
                  } 
         if self.info["userquotabase"].lower() == "user" :
@@ -1141 +1146 @@
         self.doModify(printer.ident, fields)
         
+    def writeUserOverCharge(self, user, factor) :
+        """Sets the user's overcharging coefficient."""
+        fields = {
+                   "pykotaOverCharge" : str(factor),
+                 }
+        self.doModify(user.ident, fields)
+        
     def writeUserLimitBy(self, user, limitby) :    
         """Sets the user's limiting factor."""
@@ -1183 +1195 @@
                    "pykotaLifePageCounter" : str(newlifepagecounter),
                    "pykotaDateLimit" : None,
+                   "pykotaWarnCount" : "0",
                  }  
         return self.doModify(userpquota.ident, fields)         
@@ -1246 +1259 @@
                    "pykotaHostName" : str(clienthost), 
                    "pykotaJobSizeBytes" : str(jobsizebytes),
+                   # TODO : add the 3 missing fields
                  }
         if (not self.disablehistory) or (not printer.LastJob.Exists) :
@@ -1278 +1292 @@
                    "pykotaHardLimit" : str(hardlimit),
                    "pykotaDateLimit" : "None",
+                   "pykotaWarnCount" : "0",
                  }
         self.doModify(userpquota.ident, fields)
+        
+    def writeUserPQuotaWarnCount(self, userpquota, warncount) :
+        """Sets the warn counter value for a user quota."""
+        fields = { 
+                   "pykotaWarnCount" : str(warncount or 0),
+                 }
+        self.doModify(userpquota.ident, fields)
+        
+    def increaseUserPQuotaWarnCount(self, userpquota) :
+        """Increases the warn counter value for a user quota."""
+        fields = {
+                   "pykotaWarnCount" : { "operator" : "+", "value" : 1, "convert" : int },
+                 }
+        return self.doModify(userpquota.ident, fields)         
         
     def writeGroupPQuotaLimits(self, grouppquota, softlimit, hardlimit) :

pykota/trunk/pykota/storages/sql.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.65  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.64  2005/01/18 19:47:50  jalet
 # Big bug fix wrt the datelimit attribute
@@ -273 +280 @@
             user.LifeTimePaid = fields.get("lifetimepaid")
             user.Email = fields.get("email")
+            user.OverCharge = fields.get("overcharge", 1.0)
             user.Exists = 1
         return user
@@ -317 +325 @@
                 userpquota.HardLimit = fields.get("hardlimit")
                 userpquota.DateLimit = fields.get("datelimit")
+                userpquota.WarnCount = fields.get("warncount")
                 userpquota.Exists = 1
         return userpquota
@@ -359 +368 @@
             lastjob.JobHostName = fields.get("hostname")
             lastjob.JobSizeBytes = fields.get("jobsizebytes")
+            lastjob.JobMD5Sum = fields.get("md5sum")
+            lastjob.JobPages = fields.get("pages")
+            lastjob.JobBillingCode = fields.get("billingcode")
             lastjob.Exists = 1
         return lastjob
@@ -374 +386 @@
                 user.LifeTimePaid = record.get("lifetimepaid")
                 user.Email = record.get("email")
+                user.OverCharge = record.get("overcharge")
                 user.Exists = 1
                 groupmembers.append(user)
@@ -423 +436 @@
         """Returns the list of users who uses a given printer, along with their quotas."""
         usersandquotas = []
-        result = self.doSearch("SELECT users.id as uid,username,balance,lifetimepaid,limitby,email,userpquota.id,lifepagecounter,pagecounter,softlimit,hardlimit,datelimit FROM users JOIN userpquota ON users.id=userpquota.userid AND printerid=%s ORDER BY username ASC" % self.doQuote(printer.ident))
+        result = self.doSearch("SELECT users.id as uid,username,balance,lifetimepaid,limitby,email,overcharge,userpquota.id,lifepagecounter,pagecounter,softlimit,hardlimit,datelimit,warncount FROM users JOIN userpquota ON users.id=userpquota.userid AND printerid=%s ORDER BY username ASC" % self.doQuote(printer.ident))
         if result :
             for record in result :
@@ -433 +446 @@
                     user.LifeTimePaid = record.get("lifetimepaid")
                     user.Email = record.get("email") 
+                    user.OverCharge = record.get("overcharge")
                     user.Exists = 1
                     userpquota = StorageUserPQuota(self, user, printer)
@@ -441 +455 @@
                     userpquota.HardLimit = record.get("hardlimit")
                     userpquota.DateLimit = record.get("datelimit")
+                    userpquota.WarnCount = record.get("warncount")
                     userpquota.Exists = 1
                     usersandquotas.append((user, userpquota))
@@ -466 +481 @@
     def addUser(self, user) :        
         """Adds a user to the quota storage, returns its id."""
-        self.doModify("INSERT INTO users (username, limitby, balance, lifetimepaid, email) VALUES (%s, %s, %s, %s, %s)" % (self.doQuote(user.Name), self.doQuote(user.LimitBy or 'quota'), self.doQuote(user.AccountBalance or 0.0), self.doQuote(user.LifeTimePaid or 0.0), self.doQuote(user.Email)))
+        self.doModify("INSERT INTO users (username, limitby, balance, lifetimepaid, email, overcharge) VALUES (%s, %s, %s, %s, %s, %s)" % (self.doQuote(user.Name), self.doQuote(user.LimitBy or 'quota'), self.doQuote(user.AccountBalance or 0.0), self.doQuote(user.LifeTimePaid or 0.0), self.doQuote(user.Email), self.doQuote(user.OverCharge)))
         return self.getUser(user.Name)
         
@@ -503 +518 @@
         self.doModify("UPDATE printers SET description=%s WHERE id=%s" % (self.doQuote(description), self.doQuote(printer.ident)))
         
+    def writeUserOverCharge(self, user, factor) :
+        """Sets the user's overcharging coefficient."""
+        self.doModify("UPDATE users SET overcharge=%s WHERE id=%s" % (self.doQuote(factor), self.doQuote(user.ident)))
+        
     def writeUserLimitBy(self, user, limitby) :    
         """Sets the user's limiting factor."""
@@ -521 +540 @@
     def increaseUserPQuotaPagesCounters(self, userpquota, nbpages) :    
         """Increase page counters for a user print quota."""
-        self.doModify("UPDATE userpquota SET pagecounter=pagecounter+%s,lifepagecounter=lifepagecounter+%s WHERE id=%s" % (self.doQuote(nbpages), self.doQuote(nbpages), self.doQuote(userpquota.ident)))
+        self.doModify("UPDATE userpquota SET pagecounter=pagecounter + %s,lifepagecounter=lifepagecounter + %s WHERE id=%s" % (self.doQuote(nbpages), self.doQuote(nbpages), self.doQuote(userpquota.ident)))
        
     def writeUserPQuotaPagesCounters(self, userpquota, newpagecounter, newlifepagecounter) :    
         """Sets the new page counters permanently for a user print quota."""
-        self.doModify("UPDATE userpquota SET pagecounter=%s, lifepagecounter=%s, datelimit=NULL WHERE id=%s" % (self.doQuote(newpagecounter), self.doQuote(newlifepagecounter), self.doQuote(userpquota.ident)))
+        self.doModify("UPDATE userpquota SET pagecounter=%s, lifepagecounter=%s, warncount=0, datelimit=NULL WHERE id=%s" % (self.doQuote(newpagecounter), self.doQuote(newlifepagecounter), self.doQuote(userpquota.ident)))
        
     def decreaseUserAccountBalance(self, user, amount) :    
         """Decreases user's account balance from an amount."""
-        self.doModify("UPDATE users SET balance=balance-%s WHERE id=%s" % (self.doQuote(amount), self.doQuote(user.ident)))
+        self.doModify("UPDATE users SET balance=balance - %s WHERE id=%s" % (self.doQuote(amount), self.doQuote(user.ident)))
        
     def writeUserAccountBalance(self, user, newbalance, newlifetimepaid=None) :    
@@ -565 +584 @@
     def writeUserPQuotaLimits(self, userpquota, softlimit, hardlimit) :
         """Sets soft and hard limits for a user quota."""
-        self.doModify("UPDATE userpquota SET softlimit=%s, hardlimit=%s, datelimit=NULL WHERE id=%s" % (self.doQuote(softlimit), self.doQuote(hardlimit), self.doQuote(userpquota.ident)))
+        self.doModify("UPDATE userpquota SET softlimit=%s, hardlimit=%s, warncount=0, datelimit=NULL WHERE id=%s" % (self.doQuote(softlimit), self.doQuote(hardlimit), self.doQuote(userpquota.ident)))
+        
+    def writeUserPQuotaWarnCount(self, userpquota, warncount) :
+        """Sets the warn counter value for a user quota."""
+        self.doModify("UPDATE userpquota SET warncount=%s WHERE id=%s" % (self.doQuote(warncount), self.doQuote(userpquota.ident)))
+        
+    def increaseUserPQuotaWarnCount(self, userpquota) :
+        """Increases the warn counter value for a user quota."""
+        self.doModify("UPDATE userpquota SET warncount=warncount+1 WHERE id=%s" % self.doQuote(userpquota.ident))
         
     def writeGroupPQuotaLimits(self, grouppquota, softlimit, hardlimit) :
@@ -620 +647 @@
                 job.JobHostName = fields.get("hostname")
                 job.JobSizeBytes = fields.get("jobsizebytes")
+                job.JobMD5Sum = fields.get("md5sum")
+                job.JobPages = fields.get("pages")
+                job.JobBillingCode = fields.get("billingcode")
                 job.UserName = fields.get("username")
                 job.PrinterName = fields.get("printername")

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

pykota/trunk/pykota/version.py

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

pykota/trunk/README

@@ -250 +250 @@
   You may learn more about PyKota, if it fits your own organization,
   its internal working, and some potential performance drawbacks and
-  how to avoid them, in a WiKi administered by Ryan Suarez at :
+  how to avoid them, in a document created by Ryan Suarez at :
   
     http://archive.macosxlabs.org/forum/webcrossing_archive/documentation/Pykota_and_CUPS/Pykota_and_CUPS.html
@@ -610 +610 @@
     
     which will print quota usage for all users on all printers,
-    along with totals, if you are the root user. If you are
+    along with totals, if you are a PyKota Administator. If you are
     a regular user, only your own quota report will be produced.
     
@@ -631 +631 @@
 
   - Kanakorn Horsiritham developped phpPykotaAdmin which is 
-    a web based administrative GUI :
+    a web based database independant administrative GUI :
   
       http://opensource.psu.ac.th/~kanakorn/mambo/

pykota/trunk/TODO

@@ -36 +36 @@
         - Better --prototype option in edpykota
         
-        - Web enabled pykotme and dumpykota.
+        - Web enabled pykotme.
         
         - Add an MD5 checksum of the job's datas to the
@@ -47 +47 @@
         - Maybe put "gracedelay" in the database.
         
-        - Price multiplier/divisor which can be set on a per
-          user or per user group basis.
-
         - Ink accounting ala PrintBill.
         
@@ -92 +89 @@
         - Documentation...
           
-        - Complete web administrative interface with graphical reports.
+        - Learn more bits of PHP to help with phpPyKotaAdmin, which
+          is a GREAT tool !
        
         - Group administrators (think quotagrpdmins for disk quotas).