Changeset 2317

Timestamp:

06/15/05 22:46:47 (19 years ago)

Author:

jerome

Message:

Big database changes.
Severity : From now on, existing datas have to be migrated
using the appropriate script if needed. LDAP users will need
to use the new schema. Beginning tomorrow, the code will be in
experimental quality instead of stable quality.

Location:

pykota/trunk

Files:

• initscripts/ldap/pykota.schema (modified) (8 diffs)
• initscripts/postgresql/pykota-postgresql.sql (modified) (7 diffs)
• initscripts/postgresql/upgrade-to-1.23.sql (added)
• NEWS (modified) (1 diff)
• pykota/version.py (modified) (1 diff)
• TODO (modified) (3 diffs)

pykota/trunk/initscripts/ldap/pykota.schema

@@ -226 +226 @@
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
         
+# pykotaPrecomputedJobSize
+attributetype ( 1.3.6.1.4.1.16868.1.1.33 NAME 'pykotaPrecomputedJobSize'
+        DESC 'Precomputed job size in number of pages in the history'
+        EQUALITY integerMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+# pykotaPrecomputedJobPrice
+attributetype ( 1.3.6.1.4.1.16868.1.1.34 NAME 'pykotaPrecomputedJobPrice'
+        DESC 'Precomputed Price of a particular job in the history, float'
+        EQUALITY caseIgnoreIA5Match
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+        
+# pykotaMaxJobSize
+attributetype ( 1.3.6.1.4.1.16868.1.1.35 NAME 'pykotaMaxJobSize'
+        DESC 'Maximum size allowed for a job'
+        EQUALITY integerMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+# pykotaTemporaryDenied
+attributetype ( 1.3.6.1.4.1.16868.1.1.36 NAME 'pykotaTemporaryDenied'
+        DESC 'Indicates if the user is temporarily denied to print'
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
+
+# pykotaPassThrough
+attributetype ( 1.3.6.1.4.1.16868.1.1.37 NAME 'pykotaPassThrough'
+        DESC 'Indicates if the printer is in pass through mode'
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
 
 #        
@@ -235 +262 @@
         DESC 'PyKota Auxiliary User Account'
         MUST ( uid )
-        MAY  ( pykotaUserName $ pykotaLimitBy $ mail ) )
+        MAY  ( pykotaUserName $ pykotaLimitBy $ mail $ description ) )
         
 # pykotaGroup        
@@ -241 +268 @@
         DESC 'PyKota Auxiliary Group'
         MUST ( cn )
-        MAY  ( pykotaGroupName $ pykotaLimitBy $ memberUid $ uniqueMember $ member ) )
+        MAY  ( pykotaGroupName $ pykotaLimitBy $ memberUid $ uniqueMember $ member $ description ) )
         
 # pykotaPrinter        
@@ -247 +274 @@
         DESC 'PyKota Printer'
         MUST ( cn )
-        MAY  ( description $ pykotaPrinterName $ pykotaPricePerPage $ pykotaPricePerJob $ pykotaPrinterCoefficient $ uniqueMember ) )
+        MAY  ( pykotaMaxJobSize $ pykotaPassThrough $ description $ pykotaPrinterName $ pykotaPricePerPage $ pykotaPricePerJob $ pykotaPrinterCoefficient $ uniqueMember ) )
         
 # pykotaUserPQuota        
@@ -253 +280 @@
         DESC 'PyKota User Quota on a Printer'
         MUST ( cn $ pykotaUserName $ pykotaPrinterName )
-        MAY  ( pykotaPageCounter $ pykotaLifePageCounter $ pykotaSoftLimit $ pykotaHardLimit $ pykotaDateLimit $ pykotaWarnCount ) )
+        MAY  ( pykotaMaxJobSize $ pykotaTemporaryDenied $ pykotaPageCounter $ pykotaLifePageCounter $ pykotaSoftLimit $ pykotaHardLimit $ pykotaDateLimit $ pykotaWarnCount ) )
         
 # pykotaGroupPQuota        
@@ -259 +286 @@
         DESC 'PyKota Group Quota on a Printer'
         MUST ( cn $ pykotaGroupName $ pykotaPrinterName )
-        MAY  ( pykotaSoftLimit $ pykotaHardLimit $ pykotaDateLimit ) )
+        MAY  ( pykotaMaxJobSize $ pykotaSoftLimit $ pykotaHardLimit $ pykotaDateLimit ) )
         
 # pykotaJob        
@@ -265 +292 @@
         DESC 'An entry in the job history for a printer'
         MUST ( cn $ pykotaUserName $ pykotaPrinterName $ pykotaJobId )
-        MAY  ( pykotaBillingCode $ pykotaPrinterPageCounter $ pykotaJobSize $ pykotaAction $ pykotaJobPrice $ pykotaFileName $ pykotaTitle $ pykotaCopies $ pykotaOptions $ pykotaHostName $ pykotaJobSizeBytes $ pykotaMD5Sum $ pykotaPages ) )
+        MAY  ( pykotaPrecomputedJobPrice $ pykotaPrecomputedJobSize $ pykotaBillingCode $ pykotaPrinterPageCounter $ pykotaJobSize $ pykotaAction $ pykotaJobPrice $ pykotaFileName $ pykotaTitle $ pykotaCopies $ pykotaOptions $ pykotaHostName $ pykotaJobSizeBytes $ pykotaMD5Sum $ pykotaPages ) )
         
 # pykotaAccountBalance
@@ -278 +305 @@
         MAY ( pykotaPrinterName ) ) 
         
+# pykotaBilling
+objectclass ( 1.3.6.1.4.1.16868.1.2.10 NAME 'pykotaBilling' SUP top AUXILIARY
+        DESC 'Allowed billing codes'
+        MUST ( cn $ pykotaBillingCode )
+        MAY ( pykotaPageCounter $ pykotaBalance ) )
+        
 # pykotaObject - Use it if you have to 
 objectclass ( 1.3.6.1.4.1.16868.1.2.9 NAME 'pykotaObject' SUP top STRUCTURAL

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

@@ -53 +53 @@
                    lifetimepaid FLOAT DEFAULT 0.0,
                    limitby TEXT DEFAULT 'quota',
+                   description TEXT,
                    overcharge FLOAT NOT NULL DEFAULT 1.0);
                    
@@ -60 +61 @@
 CREATE TABLE groups(id SERIAL PRIMARY KEY NOT NULL,
                     groupname TEXT UNIQUE NOT NULL,
+                    description TEXT,
                     limitby TEXT DEFAULT 'quota');
                     
@@ -69 +71 @@
                       description TEXT,
                       priceperpage FLOAT DEFAULT 0.0,
-                      priceperjob FLOAT DEFAULT 0.0);
+                      priceperjob FLOAT DEFAULT 0.0,
+                      passthrough BOOLEAN DEFAULT 'f',
+                      maxjobsize INT4);
                     
 --
@@ -82 +86 @@
                         hardlimit INT4,
                         datelimit TIMESTAMP,
+                        maxjobsize INT4,
+                        temporarydenied BOOLEAN DEFAULT 'f',
                         warncount INT4 DEFAULT 0); 
 CREATE INDEX userpquota_u_id_ix ON userpquota (userid);
@@ -107 +113 @@
                         pages TEXT,
                         billingcode TEXT,
+                        precomputedjobsize INT4,
+                        precomputedjobprice FLOAT,
                         jobdate TIMESTAMP DEFAULT now(),
                         CONSTRAINT checkUserPQuota FOREIGN KEY (userid, printerid) REFERENCES userpquota(userid, printerid));
@@ -122 +130 @@
                          softlimit INT4,
                          hardlimit INT4,
+                         maxjobsize INT4,
                          datelimit TIMESTAMP);
 CREATE INDEX grouppquota_g_id_ix ON grouppquota (groupid);
@@ -158 +167 @@
                            CONSTRAINT coeffconstraint UNIQUE (printerid, label));
 
+-- 
+-- Create the table for the billing codes
+--
+CREATE TABLE billingcodes (id SERIAL PRIMARY KEY NOT NULL,
+                           label TEXT UNIQUE NOT NULL,
+                           balance FLOAT DEFAULT 0.0,
+                           pagecounter INT4 DEFAULT 0);
+
 --                        
 -- Set some ACLs                        
 --
-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;
+REVOKE ALL ON users, groups, printers, userpquota, grouppquota, groupsmembers, printergroupsmembers, jobhistory, payments, coefficients, billingcodes 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, billingcodes_id_seq FROM public;
 
-GRANT SELECT, INSERT, UPDATE, DELETE, REFERENCES ON users, groups, printers, userpquota, grouppquota, groupsmembers, printergroupsmembers, jobhistory, payments, coefficients TO pykotaadmin;
-GRANT SELECT, UPDATE 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 TO pykotaadmin;
-GRANT SELECT ON users, groups, printers, userpquota, grouppquota, groupsmembers, printergroupsmembers, jobhistory, payments, coefficients TO pykotauser;
+GRANT SELECT, INSERT, UPDATE, DELETE, REFERENCES ON users, groups, printers, userpquota, grouppquota, groupsmembers, printergroupsmembers, jobhistory, payments, coefficients, billingcodes TO pykotaadmin;
+GRANT SELECT, UPDATE 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, billingcodes_id_seq TO pykotaadmin;
+GRANT SELECT ON users, groups, printers, userpquota, grouppquota, groupsmembers, printergroupsmembers, jobhistory, payments, coefficients, billingcodes TO pykotauser;
 

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.23alpha12 :
+    
+        - Big database changes, use the migration scripts !
+        
     - 1.23alpha11 :
     

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.23alpha11_unofficial"
+__version__ = "1.23alpha12_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS and LPRng."

pykota/trunk/TODO

@@ -48 +48 @@
                 these values, and PyKota processes the job as usual.
           
-        - Add a table listing all the allowed billing codes. Unknown
-          billing codes should produce an action which is configurable
-          (reject the job being the default). The billing codes table
-          will contains total pages and cost, and life time pages
-          and cost => speedup for LDAP, and allows people to cleanup
-          the printing history in any case. A tool to manage the
-          table of billing codes must be written, but this will
-          be easy.
-          
-        - Pass-through mode for printers : history correctly filled (including
-          job size) but no impact on user's page counter or account
-          balance : this is meant to be a temporary situation for
-          a printer to be in pass-through mode, for example during
-          an exam where the faculty pays for the printouts and we
-          don't want our users to complain about their credits being
-          "eaten" for mandatory printouts.
-          
         - Allow several levels of administrative priviledges by allowing
           files like ~pykota/pykotadmin.someusername.conf (readonly by
@@ -71 +54 @@
           in PyKota's database !
         
-        - Add a "printing denied" indicator on user print quota entries,  
-          to temporarily forbid an user to print on a particular printer.
-          
-        - Maybe per user "denyduplicates" : my 5 years old daughter 
-          just prints again when the printer is off...
-          Maybe not needed anymore since denyduplicates now allows
-          an external command to decide if the job should be allowed
-          or denied.
-          
-        - Now that the job size is ALWAYS precomputed, add a 
-          MaxJobSize attribute to users and groups (printers as
-          well, maybe ?) to limit each job's size if needed.
-          
-        - Add precomputed job size (and price) to the history for
-          controlling purpose.
-          
         - Try to talk to education based distribution coordinators
           (SambaEdu, SkoleLinux, K12LTSP, ...) to see how to
@@ -100 +67 @@
         
         - Price and statistics per page format.
-        
-        - Add a description field to users/groups.
         
         - Allow the admin to choose an action to take when the database