Index: pykota/trunk/initscripts/ldap/pykota.schema
===================================================================
--- pykota/trunk/initscripts/ldap/pykota.schema (revision 2028)
+++ pykota/trunk/initscripts/ldap/pykota.schema (revision 2054)
@@ -187,7 +187,7 @@
         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,5 +270,5 @@
 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        
Index: pykota/trunk/initscripts/postgresql/README.postgresql
===================================================================
--- pykota/trunk/initscripts/postgresql/README.postgresql (revision 2028)
+++ pykota/trunk/initscripts/postgresql/README.postgresql (revision 2054)
@@ -59,4 +59,15 @@
   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 :
Index: pykota/trunk/initscripts/postgresql/pykota-postgresql.sql
===================================================================
--- pykota/trunk/initscripts/postgresql/pykota-postgresql.sql (revision 2037)
+++ pykota/trunk/initscripts/postgresql/pykota-postgresql.sql (revision 2054)
@@ -20,4 +20,11 @@
 --
 -- $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,5 +113,5 @@
                    lifetimepaid FLOAT DEFAULT 0.0,
                    limitby TEXT DEFAULT 'quota',
-                   coefficient FLOAT NOT NULL DEFAULT 1.0);
+                   overcharge FLOAT NOT NULL DEFAULT 1.0);
                    
 --
@@ -135,5 +142,5 @@
                         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,4 +183,6 @@
                          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,5 +215,5 @@
                            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,6 +221,6 @@
 -- 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;
