Index: pykota/trunk/pykota/ipp.py
===================================================================
--- pykota/trunk/pykota/ipp.py (revision 2146)
+++ pykota/trunk/pykota/ipp.py (revision 2147)
@@ -20,12 +20,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.2  2004/12/03 20:29:33  jalet
-# ipp.py can now be run in standalone mode for testing purposes
-#
-# Revision 1.1  2004/11/06 22:35:58  jalet
-# Added a miniparser for IPP messages (RFC 2910). The job-originating-host-name
-# retrieval is now fiable, unless the CUPS developpers change something...
 #
 #
Index: pykota/trunk/pykota/dumper.py
===================================================================
--- pykota/trunk/pykota/dumper.py (revision 2146)
+++ pykota/trunk/pykota/dumper.py (revision 2147)
@@ -19,20 +19,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.3  2005/01/19 09:00:54  jalet
-# Small fix for Python2.1 and variables scopes
-#
-# Revision 1.2  2005/01/19 08:49:41  jalet
-# Now dumpykota.cgi behaves like printquota.cgi wrt the REMOTE_USER environment
-# variables if the script is username+password protected.
-# Small fix in printquota.cgi wrt ldap auth with Apache : the workaround was
-# not used everywhere.
-#
-# Revision 1.1  2005/01/08 17:03:07  jalet
-# "--format cups" output more resembling CUPS' page_log.
-# Split into a command line tool and a module, to allow easier coding of
-# a CGI interface.
-#
 #
 #
Index: pykota/trunk/pykota/reporters/html.py
===================================================================
--- pykota/trunk/pykota/reporters/html.py (revision 2146)
+++ pykota/trunk/pykota/reporters/html.py (revision 2147)
@@ -20,34 +20,4 @@
 #
 # $Id$
-#
-# $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.
-#
-# Revision 1.7  2004/01/12 15:12:50  jalet
-# Small fix for history
-#
-# Revision 1.6  2004/01/12 14:35:01  jalet
-# Printing history added to CGI script.
-#
-# Revision 1.5  2004/01/08 14:10:33  jalet
-# Copyright year changed.
-#
-# Revision 1.4  2004/01/06 15:51:46  jalet
-# Code factorization
-#
-# Revision 1.3  2003/12/27 16:49:25  uid67467
-# Should be ok now.
-#
-# Revision 1.1  2003/12/02 14:41:17  jalet
-# And as always, I forgot most of the new files :-)
-#
 #
 #
Index: pykota/trunk/pykota/reporters/text.py
===================================================================
--- pykota/trunk/pykota/reporters/text.py (revision 2146)
+++ pykota/trunk/pykota/reporters/text.py (revision 2147)
@@ -20,42 +20,4 @@
 #
 # $Id$
-#
-# $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.
-#
-# Revision 1.8  2004/01/06 15:51:46  jalet
-# Code factorization
-#
-# Revision 1.7  2003/12/27 16:49:25  uid67467
-# Should be ok now.
-#
-# Revision 1.6  2003/12/02 14:40:21  jalet
-# Some code refactoring.
-# New HTML reporter added, which is now used in the CGI script for web based
-# print quota reports. It will need some de-uglyfication though...
-#
-# Revision 1.5  2003/10/07 09:07:29  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.4  2003/07/07 11:49:24  jalet
-# Lots of small fixes with the help of PyChecker
-#
-# Revision 1.3  2003/07/05 07:46:50  jalet
-# The previous bug fix was incomplete.
-#
-# Revision 1.2  2003/07/02 09:29:12  jalet
-# Bug fixed when wanting a report and an user/group was limited by account balance
-#
-# Revision 1.1  2003/06/30 12:46:15  jalet
-# Extracted reporting code.
-#
 #
 #
Index: pykota/trunk/pykota/storages/pgstorage.py
===================================================================
--- pykota/trunk/pykota/storages/pgstorage.py (revision 2146)
+++ pykota/trunk/pykota/storages/pgstorage.py (revision 2147)
@@ -20,137 +20,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.39  2005/01/19 08:56:30  jalet
-# Convert PygreSQL's new exception into a string before re-raising it
-#
-# Revision 1.38  2005/01/19 08:48:17  jalet
-# Fix exception's name wrt newer versions of PygreSQL
-#
-# Revision 1.37  2004/09/14 22:29:12  jalet
-# First version of dumpykota. Works fine but only with PostgreSQL backend
-# for now.
-#
-# Revision 1.36  2004/06/03 23:14:11  jalet
-# Now stores the job's size in bytes in the database.
-# Preliminary work on payments storage : database schemas are OK now,
-# but no code to store payments yet.
-# Removed schema picture, not relevant anymore.
-#
-# Revision 1.35  2004/02/02 22:44:16  jalet
-# Preliminary work on Relationnal Database Independance via DB-API 2.0
-#
-# Revision 1.34  2004/01/12 15:12:50  jalet
-# Small fix for history
-#
-# Revision 1.33  2004/01/12 14:44:47  jalet
-# Missing space in SQL query
-#
-# Revision 1.32  2004/01/12 14:35:02  jalet
-# Printing history added to CGI script.
-#
-# Revision 1.31  2004/01/10 09:44:02  jalet
-# Fixed potential accuracy problem if a user printed on several printers at
-# the very same time.
-#
-# Revision 1.30  2004/01/08 16:33:27  jalet
-# Additionnal check to not create a circular printers group.
-#
-# Revision 1.29  2004/01/08 16:24:49  jalet
-# edpykota now supports adding printers to printer groups.
-#
-# Revision 1.28  2004/01/08 14:10:33  jalet
-# Copyright year changed.
-#
-# Revision 1.27  2004/01/06 14:24:59  jalet
-# Printer groups should be cached now, if caching is enabled.
-#
-# Revision 1.26  2003/12/29 14:12:48  uid67467
-# Tries to workaround possible integrity violations when retrieving printer groups
-#
-# Revision 1.25  2003/12/27 16:49:25  uid67467
-# Should be ok now.
-#
-# Revision 1.24  2003/11/29 22:02:14  jalet
-# Don't try to retrieve the user print quota information if current printer
-# doesn't exist.
-#
-# Revision 1.23  2003/11/23 19:01:37  jalet
-# Job price added to history
-#
-# Revision 1.22  2003/11/21 14:28:46  jalet
-# More complete job history.
-#
-# Revision 1.21  2003/11/12 13:06:38  jalet
-# Bug fix wrt no user/group name command line argument to edpykota
-#
-# Revision 1.20  2003/10/09 21:25:26  jalet
-# Multiple printer names or wildcards can be passed on the command line
-# separated with commas.
-# Beta phase.
-#
-# Revision 1.19  2003/10/08 07:01:20  jalet
-# Job history can be disabled.
-# Some typos in README.
-# More messages in setup script.
-#
-# Revision 1.18  2003/10/07 09:07:30  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.17  2003/10/06 13:12:28  jalet
-# More work on caching
-#
-# Revision 1.16  2003/10/03 18:01:49  jalet
-# Nothing interesting...
-#
-# Revision 1.15  2003/10/03 12:27:03  jalet
-# Several optimizations, especially with LDAP backend
-#
-# Revision 1.14  2003/10/03 08:57:55  jalet
-# Caching mechanism now caches all that's cacheable.
-#
-# Revision 1.13  2003/10/02 20:23:18  jalet
-# Storage caching mechanism added.
-#
-# Revision 1.12  2003/08/17 14:20:25  jalet
-# Bug fix by Oleg Biteryakov
-#
-# Revision 1.11  2003/07/29 20:55:17  jalet
-# 1.14 is out !
-#
-# Revision 1.10  2003/07/16 21:53:08  jalet
-# Really big modifications wrt new configuration file's location and content.
-#
-# Revision 1.9  2003/07/14 17:20:15  jalet
-# Bug in postgresql storage when modifying the prices for a printer
-#
-# Revision 1.8  2003/07/14 14:18:17  jalet
-# Wrong documentation strings
-#
-# Revision 1.7  2003/07/09 20:17:07  jalet
-# Email field added to PostgreSQL schema
-#
-# Revision 1.6  2003/07/07 11:49:24  jalet
-# Lots of small fixes with the help of PyChecker
-#
-# Revision 1.5  2003/07/07 08:33:19  jalet
-# Bug fix due to a typo in LDAP code
-#
-# Revision 1.4  2003/06/30 13:54:21  jalet
-# Sorts by user / group name
-#
-# Revision 1.3  2003/06/25 14:10:01  jalet
-# Hey, it may work (edpykota --reset excepted) !
-#
-# Revision 1.2  2003/06/12 21:09:57  jalet
-# wrongly placed code.
-#
-# Revision 1.1  2003/06/10 16:37:54  jalet
-# Deletion of the second user which is not needed anymore.
-# Added a debug configuration field in /etc/pykota.conf
-# All queries can now be sent to the logger in debug mode, this will
-# greatly help improve performance when time for this will come.
-#
-#
 #
 #
Index: pykota/trunk/pykota/storages/sql.py
===================================================================
--- pykota/trunk/pykota/storages/sql.py (revision 2146)
+++ pykota/trunk/pykota/storages/sql.py (revision 2147)
@@ -20,127 +20,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.67  2005/02/16 00:29:33  jalet
-# Fixed the maxdenybanners directive.
-# Introduced the denyduplicates directive.
-# Fixed some database related glitches.
-#
-# Revision 1.66  2005/02/13 22:48:38  jalet
-# Added the md5sum to the history
-#
-# 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
-#
-# Revision 1.63  2005/01/01 08:16:17  jalet
-# Fixed a problem which occured when 'limitby' was unset in the PostgreSQL
-# database
-#
-# Revision 1.62  2004/12/21 16:19:44  jalet
-# Fixed the problem with dumpykota's filtering of printers groups membership
-#
-# Revision 1.61  2004/12/21 15:49:59  jalet
-# The dumpykota command now supports extended filtering capabilities with
-# the PostgreSQL backend. LDAP doesn't yet support such possibilities.
-#
-# Revision 1.60  2004/12/21 14:45:31  jalet
-# Prepared dumpykota to accept the new --filter command line option. Some
-# additionnal work needs to be done in the backends though.
-#
-# Revision 1.59  2004/10/25 14:12:25  jalet
-# For URGENT legal reasons (Italy), a new "privacy" directive was added to pykota.conf
-# to hide print jobs' title, filename, and options.
-#
-# Revision 1.58  2004/10/12 08:58:53  jalet
-# Now warnpykota only warns users who have already printed, to not confuse
-# users who have just opened their account.
-#
-# Revision 1.57  2004/10/10 10:12:21  jalet
-# Improved SQL queries for groups. Same work has to be done for groups print quotas.
-#
-# Revision 1.56  2004/10/07 21:14:28  jalet
-# Hopefully final fix for data encoding to and from the database
-#
-# Revision 1.55  2004/10/07 09:37:53  jalet
-# Fixes recently introduced bug wrt users groups (was it three days ago ?)
-#
-# Revision 1.54  2004/10/05 10:05:04  jalet
-# UnicodeEncodeError isn't defined in Python2.1
-#
-# Revision 1.53  2004/10/05 09:59:20  jalet
-# Restore compatibility with Python 2.1
-#
-# Revision 1.52  2004/10/04 22:23:54  jalet
-# Charset conversions for dumps from the PostgreSQL backend
-#
-# Revision 1.51  2004/10/04 16:11:38  jalet
-# Now outputs page counters when dumping user groups quotas
-#
-# Revision 1.50  2004/10/04 16:01:15  jalet
-# More complete dumps for groups and groups quotas
-#
-# Revision 1.49  2004/10/02 13:33:13  jalet
-# Some work done of user's charset handling in database dumps.
-#
-# Revision 1.48  2004/10/02 05:48:56  jalet
-# Should now correctly deal with charsets both when storing into databases and when
-# retrieving datas. Works with both PostgreSQL and LDAP.
-#
-# Revision 1.47  2004/09/15 07:26:20  jalet
-# Data dumps are now ordered by entry creation date if applicable.
-# Now dumpykota exits with a message when there's a broken pipe like
-# in dumpykota --data history | head -3
-#
-# Revision 1.46  2004/09/15 06:58:25  jalet
-# User groups membership and printer groups membership can now be dumped too
-#
-# Revision 1.45  2004/09/14 22:29:13  jalet
-# First version of dumpykota. Works fine but only with PostgreSQL backend
-# for now.
-#
-# Revision 1.44  2004/09/10 21:32:54  jalet
-# Small fixes for incomplete entry intialization
-#
-# Revision 1.43  2004/07/01 17:45:49  jalet
-# Added code to handle the description field for printers
-#
-# Revision 1.42  2004/06/08 17:44:43  jalet
-# Payment now gets deleted when the user is deleted
-#
-# Revision 1.41  2004/06/05 22:03:50  jalet
-# Payments history is now stored in database
-#
-# Revision 1.40  2004/06/03 23:14:11  jalet
-# Now stores the job's size in bytes in the database.
-# Preliminary work on payments storage : database schemas are OK now,
-# but no code to store payments yet.
-# Removed schema picture, not relevant anymore.
-#
-# Revision 1.39  2004/05/26 14:50:12  jalet
-# First try at saving the job-originating-hostname in the database
-#
-# Revision 1.38  2004/05/06 12:37:47  jalet
-# pkpgcounter : comments
-# pkprinters : when --add is used, existing printers are now skipped.
-#
-# Revision 1.37  2004/02/23 22:53:21  jalet
-# Don't retrieve data when it's not needed, to avoid database queries
-#
-# Revision 1.36  2004/02/04 13:24:41  jalet
-# pkprinters can now remove printers from printers groups.
-#
-# Revision 1.35  2004/02/04 11:17:00  jalet
-# pkprinters command line tool added.
-#
-# Revision 1.34  2004/02/02 22:44:16  jalet
-# Preliminary work on Relationnal Database Independance via DB-API 2.0
-#
 #
 #
Index: pykota/trunk/pykota/storages/dbistorage.py
===================================================================
--- pykota/trunk/pykota/storages/dbistorage.py (revision 2146)
+++ pykota/trunk/pykota/storages/dbistorage.py (revision 2147)
@@ -20,12 +20,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.2  2004/09/24 21:19:48  jalet
-# Did a pass of PyChecker
-#
-# Revision 1.1  2004/02/02 22:44:15  jalet
-# Preliminary work on Relationnal Database Independance via DB-API 2.0
-#
 #
 #
Index: pykota/trunk/pykota/storages/ldapstorage.py
===================================================================
--- pykota/trunk/pykota/storages/ldapstorage.py (revision 2146)
+++ pykota/trunk/pykota/storages/ldapstorage.py (revision 2147)
@@ -20,354 +20,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.103  2005/02/25 14:47:27  jalet
-# Improved robustness for manually modified LDAP trees
-#
-# Revision 1.102  2005/02/25 14:31:07  jalet
-# Improved robustness
-#
-# Revision 1.101  2005/02/13 22:48:37  jalet
-# Added the md5sum to the history
-#
-# 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
-#
-# Revision 1.98  2005/01/24 17:35:24  jalet
-# Performance improvement for user print quota entries search
-#
-# Revision 1.97  2005/01/24 17:27:35  jalet
-# typo
-#
-# Revision 1.96  2005/01/24 15:38:51  jalet
-# Fixed some ldap filters
-#
-# Revision 1.95  2005/01/18 19:47:50  jalet
-# Big bug fix wrt the datelimit attribute
-#
-# Revision 1.94  2005/01/01 18:53:27  jalet
-# Implemented in the LDAP backend code the same fix than in PostgreSQL backend
-# code for people who don't use PyKota tools to manage accounts.
-#
-# Revision 1.93  2004/12/31 16:10:57  jalet
-# Fixed recently introduced bugs due to extended userquotabase and groupquotabase
-# directives.
-#
-# Revision 1.92  2004/12/26 14:50:51  jalet
-# Normalized fields names in dumpykota's output so that an LDAP or PostgreSQL
-# dump is parseable the same way.
-#
-# Revision 1.91  2004/12/21 16:46:25  jalet
-# dumpykota's filtering capabilities are now supported within the LDAP
-# backend as well as within the PostgreSQL backend. Untested though since
-# my only PyKota+LDAP setup is on my laptop at work :-)
-#
-# Revision 1.90  2004/12/21 14:45:31  jalet
-# Prepared dumpykota to accept the new --filter command line option. Some
-# additionnal work needs to be done in the backends though.
-#
-# Revision 1.89  2004/12/02 22:27:11  jalet
-# Integrated and extended Stefan Wold's patch to store print quota entries
-# directly below the user or the group object with the LDAP backend
-#
-# Revision 1.88  2004/12/02 22:01:58  jalet
-# TLS is now supported with the LDAP backend
-#
-# Revision 1.87  2004/12/02 12:34:00  jalet
-# Now automates LDAP reconnections if the server dropped the connection due
-# to a timeout.
-#
-# Revision 1.86  2004/10/25 14:12:25  jalet
-# For URGENT legal reasons (Italy), a new "privacy" directive was added to pykota.conf
-# to hide print jobs' title, filename, and options.
-#
-# Revision 1.85  2004/10/24 12:55:09  jalet
-# Missing spaces
-#
-# Revision 1.84  2004/10/12 08:58:53  jalet
-# Now warnpykota only warns users who have already printed, to not confuse
-# users who have just opened their account.
-#
-# Revision 1.83  2004/10/07 21:14:28  jalet
-# Hopefully final fix for data encoding to and from the database
-#
-# Revision 1.82  2004/10/05 09:59:20  jalet
-# Restore compatibility with Python 2.1
-#
-# Revision 1.81  2004/10/04 11:27:57  jalet
-# Finished LDAP support for dumpykota.
-#
-# Revision 1.80  2004/10/03 19:57:57  jalet
-# Dump of payments should work with LDAP backend now.
-#
-# Revision 1.79  2004/10/03 19:52:59  jalet
-# More work done on LDAP and dumpykota
-#
-# Revision 1.78  2004/10/02 05:48:56  jalet
-# Should now correctly deal with charsets both when storing into databases and when
-# retrieving datas. Works with both PostgreSQL and LDAP.
-#
-# Revision 1.77  2004/09/28 14:29:00  jalet
-# dumpykota for LDAP backend is almost there.
-#
-# Revision 1.76  2004/09/28 09:11:56  jalet
-# Fix for accented chars in print job's title, filename, and options
-#
-# Revision 1.75  2004/09/24 20:21:50  jalet
-# Fixed pykotaAccountBalance object location during creation
-#
-# Revision 1.74  2004/09/02 10:09:30  jalet
-# Fixed bug in LDAP user deletion code which didn't correctly delete the user's
-# pykotaLastJob entries.
-#
-# Revision 1.73  2004/07/17 20:37:27  jalet
-# Missing file... Am I really stupid ?
-#
-# Revision 1.72  2004/07/01 19:56:43  jalet
-# Better dispatching of error messages
-#
-# Revision 1.71  2004/07/01 17:45:49  jalet
-# Added code to handle the description field for printers
-#
-# Revision 1.70  2004/06/10 20:50:25  jalet
-# Better log message
-#
-# Revision 1.69  2004/06/05 22:18:04  jalet
-# Now catches some exceptions earlier.
-# storage.py and ldapstorage.py : removed old comments
-#
-# Revision 1.68  2004/06/05 22:03:50  jalet
-# Payments history is now stored in database
-#
-# Revision 1.67  2004/06/03 23:14:10  jalet
-# Now stores the job's size in bytes in the database.
-# Preliminary work on payments storage : database schemas are OK now,
-# but no code to store payments yet.
-# Removed schema picture, not relevant anymore.
-#
-# Revision 1.66  2004/05/28 20:56:45  jalet
-# Extended syntax for LDAP specific newuser and newgroup directives. Untested.
-#
-# Revision 1.65  2004/05/27 12:52:12  jalet
-# More useful error message in case of misconfiguration of an LDAP  search base
-# in pykota.conf
-#
-# Revision 1.64  2004/05/26 14:50:01  jalet
-# First try at saving the job-originating-hostname in the database
-#
-# Revision 1.63  2004/05/06 12:37:46  jalet
-# pkpgcounter : comments
-# pkprinters : when --add is used, existing printers are now skipped.
-#
-# Revision 1.62  2004/03/05 14:31:58  jalet
-# Improvement on strange history entries
-#
-# Revision 1.61  2004/03/05 13:19:53  jalet
-# Code safer wrt entries created in other tools
-#
-# Revision 1.60  2004/03/02 14:39:02  jalet
-# Final fix for printers searching
-#
-# Revision 1.59  2004/03/02 14:35:46  jalet
-# Missing test when searching printer objects when these objects were manually
-# created and don't contain the pykotaPrinterName attribute
-#
-# Revision 1.58  2004/02/27 09:30:33  jalet
-# datelimit wasn't reset when modifying soft and hard limits with the LDAP backend
-#
-# Revision 1.57  2004/02/26 14:18:07  jalet
-# Should fix the remaining bugs wrt printers groups and users groups.
-#
-# Revision 1.56  2004/02/25 16:52:39  jalet
-# Small fix wrt empty user groups
-#
-# Revision 1.55  2004/02/23 22:53:21  jalet
-# Don't retrieve data when it's not needed, to avoid database queries
-#
-# Revision 1.54  2004/02/20 16:38:39  jalet
-# ldapcache directive marked as experimental
-#
-# Revision 1.53  2004/02/20 14:42:21  jalet
-# Experimental ldapcache directive added
-#
-# Revision 1.52  2004/02/17 23:41:48  jalet
-# Preliminary work on low-level LDAP specific cache.
-#
-# Revision 1.51  2004/02/04 13:24:41  jalet
-# pkprinters can now remove printers from printers groups.
-#
-# Revision 1.50  2004/02/04 11:17:00  jalet
-# pkprinters command line tool added.
-#
-# Revision 1.49  2004/01/29 22:35:45  jalet
-# Small fix from Matt.
-#
-# Revision 1.48  2004/01/12 14:35:02  jalet
-# Printing history added to CGI script.
-#
-# Revision 1.47  2004/01/10 09:44:02  jalet
-# Fixed potential accuracy problem if a user printed on several printers at
-# the very same time.
-#
-# Revision 1.46  2004/01/08 16:33:27  jalet
-# Additionnal check to not create a circular printers group.
-#
-# Revision 1.45  2004/01/08 16:24:49  jalet
-# edpykota now supports adding printers to printer groups.
-#
-# Revision 1.44  2004/01/08 14:10:33  jalet
-# Copyright year changed.
-#
-# Revision 1.43  2004/01/06 14:24:59  jalet
-# Printer groups should be cached now, if caching is enabled.
-#
-# Revision 1.42  2003/12/29 14:12:48  uid67467
-# Tries to workaround possible integrity violations when retrieving printer groups
-#
-# Revision 1.41  2003/12/27 16:49:25  uid67467
-# Should be ok now.
-#
-# Revision 1.40  2003/11/29 22:02:14  jalet
-# Don't try to retrieve the user print quota information if current printer
-# doesn't exist.
-#
-# Revision 1.39  2003/11/26 23:35:32  jalet
-# Added a bit of code to support the setting of the user's email address
-# which was ignored during writes for now.
-#
-# Revision 1.38  2003/11/24 09:54:06  jalet
-# Small fix for LDAP when pykotaOptions attribute wasn't present.
-#
-# Revision 1.37  2003/11/23 19:01:37  jalet
-# Job price added to history
-#
-# Revision 1.36  2003/11/21 14:28:46  jalet
-# More complete job history.
-#
-# Revision 1.35  2003/11/12 13:06:37  jalet
-# Bug fix wrt no user/group name command line argument to edpykota
-#
-# Revision 1.34  2003/10/24 08:37:55  jalet
-# More complete messages in case of LDAP failure.
-# LDAP database connection is now unbound on exit too.
-#
-# Revision 1.33  2003/10/08 07:01:20  jalet
-# Job history can be disabled.
-# Some typos in README.
-# More messages in setup script.
-#
-# Revision 1.32  2003/10/07 14:23:25  jalet
-# More work on cache
-#
-# Revision 1.31  2003/10/07 09:07:30  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.30  2003/10/06 14:42:36  jalet
-# LDAP group access will be slower when cache is disabled, but at least code
-# is consistent with the rest of the caching mechanis, but at least code
-# is consistent with the rest of the caching mechanism
-#
-# Revision 1.29  2003/10/06 13:12:28  jalet
-# More work on caching
-#
-# Revision 1.28  2003/10/03 12:27:02  jalet
-# Several optimizations, especially with LDAP backend
-#
-# Revision 1.27  2003/10/03 08:57:55  jalet
-# Caching mechanism now caches all that's cacheable.
-#
-# Revision 1.26  2003/10/02 20:23:18  jalet
-# Storage caching mechanism added.
-#
-# Revision 1.25  2003/08/20 15:56:24  jalet
-# Better user and group deletion
-#
-# Revision 1.24  2003/07/29 20:55:17  jalet
-# 1.14 is out !
-#
-# Revision 1.23  2003/07/29 19:52:32  jalet
-# Forgot to read the email field from LDAP
-#
-# Revision 1.22  2003/07/29 09:54:03  jalet
-# Added configurable LDAP mail attribute support
-#
-# Revision 1.21  2003/07/28 09:11:12  jalet
-# PyKota now tries to add its attributes intelligently in existing LDAP
-# directories.
-#
-# Revision 1.20  2003/07/25 10:41:30  jalet
-# Better documentation.
-# pykotme now displays the current user's account balance.
-# Some test changed in ldap module.
-#
-# Revision 1.19  2003/07/14 14:18:16  jalet
-# Wrong documentation strings
-#
-# Revision 1.18  2003/07/11 14:23:13  jalet
-# When adding an user only adds one object containing both the user and
-# its account balance instead of two objects.
-#
-# Revision 1.17  2003/07/07 12:51:07  jalet
-# Small fix
-#
-# Revision 1.16  2003/07/07 12:11:13  jalet
-# Small fix
-#
-# Revision 1.15  2003/07/07 11:49:24  jalet
-# Lots of small fixes with the help of PyChecker
-#
-# Revision 1.14  2003/07/07 08:33:18  jalet
-# Bug fix due to a typo in LDAP code
-#
-# Revision 1.13  2003/07/05 07:46:50  jalet
-# The previous bug fix was incomplete.
-#
-# Revision 1.12  2003/06/30 13:54:21  jalet
-# Sorts by user / group name
-#
-# Revision 1.11  2003/06/25 14:10:01  jalet
-# Hey, it may work (edpykota --reset excepted) !
-#
-# Revision 1.10  2003/06/16 21:55:15  jalet
-# More work on LDAP, again. Problem detected.
-#
-# Revision 1.9  2003/06/16 11:59:09  jalet
-# More work on LDAP
-#
-# Revision 1.8  2003/06/15 22:26:52  jalet
-# More work on LDAP
-#
-# Revision 1.7  2003/06/14 22:44:21  jalet
-# More work on LDAP storage backend.
-#
-# Revision 1.6  2003/06/13 19:07:57  jalet
-# Two big bugs fixed, time to release something ;-)
-#
-# Revision 1.5  2003/06/10 16:37:54  jalet
-# Deletion of the second user which is not needed anymore.
-# Added a debug configuration field in /etc/pykota.conf
-# All queries can now be sent to the logger in debug mode, this will
-# greatly help improve performance when time for this will come.
-#
-# Revision 1.4  2003/06/10 10:45:32  jalet
-# Not implemented methods now raise an exception when called.
-#
-# Revision 1.3  2003/06/06 20:49:15  jalet
-# Very latest schema. UNTESTED.
-#
-# Revision 1.2  2003/06/06 14:21:08  jalet
-# New LDAP schema.
-# Small bug fixes.
-#
-# Revision 1.1  2003/06/05 11:19:13  jalet
-# More good work on LDAP storage.
-#
 #
 #
Index: pykota/trunk/pykota/cgifuncs.py
===================================================================
--- pykota/trunk/pykota/cgifuncs.py (revision 2146)
+++ pykota/trunk/pykota/cgifuncs.py (revision 2147)
@@ -18,8 +18,4 @@
 # $Id$
 #
-# $Log$
-# Revision 1.1  2005/01/08 17:13:01  jalet
-# Move some functions outside of the CGI to allow their use in other CGI scripts
-#
 #
 
Index: pykota/trunk/pykota/reporter.py
===================================================================
--- pykota/trunk/pykota/reporter.py (revision 2146)
+++ pykota/trunk/pykota/reporter.py (revision 2147)
@@ -20,47 +20,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.12  2005/02/15 13:13:27  jalet
-# Fixes output when user has got a negative or nul overcharging factor.
-#
-# 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
-# pykotaLastJob entries.
-#
-# Revision 1.9  2004/07/01 17:45:49  jalet
-# Added code to handle the description field for printers
-#
-# Revision 1.8  2004/03/24 15:15:24  jalet
-# Began integration of Henrik Janhagen's work on quota-then-balance
-# and balance-then-quota
-#
-# Revision 1.7  2004/01/08 14:10:32  jalet
-# Copyright year changed.
-#
-# Revision 1.6  2003/12/27 16:49:25  uid67467
-# Should be ok now.
-#
-# Revision 1.4  2003/12/02 14:40:21  jalet
-# Some code refactoring.
-# New HTML reporter added, which is now used in the CGI script for web based
-# print quota reports. It will need some de-uglyfication though...
-#
-# Revision 1.3  2003/11/25 23:46:40  jalet
-# Don't try to verify if module name is valid, Python does this better than us.
-#
-# Revision 1.2  2003/10/07 09:07:28  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.1  2003/06/30 12:46:15  jalet
-# Extracted reporting code.
-#
 #
 #
Index: pykota/trunk/pykota/storage.py
===================================================================
--- pykota/trunk/pykota/storage.py (revision 2146)
+++ pykota/trunk/pykota/storage.py (revision 2147)
@@ -20,246 +20,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.70  2005/02/16 00:29:33  jalet
-# Fixed the maxdenybanners directive.
-# Introduced the denyduplicates directive.
-# Fixed some database related glitches.
-#
-# Revision 1.69  2005/02/13 22:48:37  jalet
-# Added the md5sum to the history
-#
-# 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
-#
-# Revision 1.66  2004/12/02 21:24:50  jalet
-# Integrated the patch by Wilson Roberto Afonso and Matt Hyclak to allow
-# edpykota to accept the -U | --used value command line option.
-#
-# Revision 1.65  2004/10/25 14:12:25  jalet
-# For URGENT legal reasons (Italy), a new "privacy" directive was added to pykota.conf
-# to hide print jobs' title, filename, and options.
-#
-# Revision 1.64  2004/10/08 20:19:18  jalet
-# Added ugly workaround for strange locale problem
-#
-# Revision 1.63  2004/10/07 21:14:28  jalet
-# Hopefully final fix for data encoding to and from the database
-#
-# Revision 1.62  2004/09/28 17:45:31  jalet
-# Added the --hardreset command line option to edpykota
-#
-# Revision 1.61  2004/09/24 21:19:48  jalet
-# Did a pass of PyChecker
-#
-# Revision 1.60  2004/09/24 20:21:50  jalet
-# Fixed pykotaAccountBalance object location during creation
-#
-# Revision 1.59  2004/09/10 21:32:52  jalet
-# Small fixes for incomplete entry intialization
-#
-# Revision 1.58  2004/09/02 10:09:30  jalet
-# Fixed bug in LDAP user deletion code which didn't correctly delete the user's
-# pykotaLastJob entries.
-#
-# Revision 1.57  2004/07/22 22:41:48  jalet
-# Hardware accounting for LPRng should be OK now. UNTESTED.
-#
-# Revision 1.56  2004/07/01 17:45:49  jalet
-# Added code to handle the description field for printers
-#
-# Revision 1.55  2004/06/05 22:18:04  jalet
-# Now catches some exceptions earlier.
-# storage.py and ldapstorage.py : removed old comments
-#
-# Revision 1.54  2004/06/05 22:03:49  jalet
-# Payments history is now stored in database
-#
-# Revision 1.53  2004/06/03 23:14:10  jalet
-# Now stores the job's size in bytes in the database.
-# Preliminary work on payments storage : database schemas are OK now,
-# but no code to store payments yet.
-# Removed schema picture, not relevant anymore.
-#
-# Revision 1.52  2004/05/26 14:49:57  jalet
-# First try at saving the job-originating-hostname in the database
-#
-# Revision 1.51  2004/03/24 15:15:24  jalet
-# Began integration of Henrik Janhagen's work on quota-then-balance
-# and balance-then-quota
-#
-# Revision 1.50  2004/03/09 08:05:27  jalet
-# Small fix : only keeps existing quota entries when searching parents
-#
-# Revision 1.49  2004/03/01 15:06:51  jalet
-# Pre and Post hooks should now work in the pykota filter too.
-# The pykota filter doesn't check the last user's quota anymore
-# when delayed hardware accounting is used : this will be checked
-# anyway the next time the last user will print
-#
-# Revision 1.48  2004/02/27 13:50:12  jalet
-# Hopefully the final fix for groups (users and printers)
-#
-# Revision 1.47  2004/02/27 09:30:33  jalet
-# datelimit wasn't reset when modifying soft and hard limits with the LDAP backend
-#
-# Revision 1.46  2004/02/26 14:18:07  jalet
-# Should fix the remaining bugs wrt printers groups and users groups.
-#
-# Revision 1.45  2004/02/26 10:40:40  jalet
-# Fixed nested printer groups accounting.
-#
-# Revision 1.44  2004/02/25 19:09:24  jalet
-# Fix for LDAP problem when job price was 0.
-#
-# Revision 1.43  2004/02/25 12:36:34  jalet
-# Avoids a database query even if caching was disabled.
-#
-# Revision 1.42  2004/02/23 22:53:21  jalet
-# Don't retrieve data when it's not needed, to avoid database queries
-#
-# Revision 1.41  2004/02/04 17:12:33  jalet
-# Removing a printer from a printers group should work now.
-#
-# Revision 1.40  2004/02/04 13:24:41  jalet
-# pkprinters can now remove printers from printers groups.
-#
-# Revision 1.39  2004/02/04 11:16:59  jalet
-# pkprinters command line tool added.
-#
-# Revision 1.38  2004/01/12 22:43:40  jalet
-# New formula to compute a job's price
-#
-# Revision 1.37  2004/01/12 14:35:01  jalet
-# Printing history added to CGI script.
-#
-# Revision 1.36  2004/01/10 09:44:02  jalet
-# Fixed potential accuracy problem if a user printed on several printers at
-# the very same time.
-#
-# Revision 1.35  2004/01/08 16:33:27  jalet
-# Additionnal check to not create a circular printers group.
-#
-# Revision 1.34  2004/01/08 16:24:49  jalet
-# edpykota now supports adding printers to printer groups.
-#
-# Revision 1.33  2004/01/08 14:10:32  jalet
-# Copyright year changed.
-#
-# Revision 1.32  2004/01/06 16:02:57  jalet
-# This time printer groups caching works.
-#
-# Revision 1.31  2004/01/06 15:51:24  jalet
-# Fixed caching of printer groups
-#
-# Revision 1.30  2004/01/06 14:24:59  jalet
-# Printer groups should be cached now, if caching is enabled.
-#
-# Revision 1.29  2003/12/27 16:49:25  uid67467
-# Should be ok now.
-#
-# Revision 1.28  2003/11/25 23:46:40  jalet
-# Don't try to verify if module name is valid, Python does this better than us.
-#
-# Revision 1.27  2003/11/23 19:01:36  jalet
-# Job price added to history
-#
-# Revision 1.26  2003/11/21 14:28:45  jalet
-# More complete job history.
-#
-# Revision 1.25  2003/10/08 21:12:27  jalet
-# Do not cache anymore entries which don't exist.
-#
-# Revision 1.24  2003/10/07 22:06:05  jalet
-# Preliminary code to disable job history
-#
-# Revision 1.23  2003/10/07 09:07:28  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.22  2003/10/06 13:12:27  jalet
-# More work on caching
-#
-# Revision 1.21  2003/10/03 09:02:20  jalet
-# Logs cache store actions too
-#
-# Revision 1.20  2003/10/02 20:23:18  jalet
-# Storage caching mechanism added.
-#
-# Revision 1.19  2003/07/16 21:53:07  jalet
-# Really big modifications wrt new configuration file's location and content.
-#
-# Revision 1.18  2003/07/07 08:33:18  jalet
-# Bug fix due to a typo in LDAP code
-#
-# Revision 1.17  2003/07/05 07:46:50  jalet
-# The previous bug fix was incomplete.
-#
-# Revision 1.16  2003/06/25 19:52:31  jalet
-# Should be ready for testing :-)
-#
-# Revision 1.15  2003/06/25 14:10:58  jalet
-# Exception raising for now.
-#
-# Revision 1.14  2003/06/25 14:10:01  jalet
-# Hey, it may work (edpykota --reset excepted) !
-#
-# Revision 1.13  2003/06/10 16:37:54  jalet
-# Deletion of the second user which is not needed anymore.
-# Added a debug configuration field in /etc/pykota.conf
-# All queries can now be sent to the logger in debug mode, this will
-# greatly help improve performance when time for this will come.
-#
-# Revision 1.12  2003/04/23 22:13:57  jalet
-# Preliminary support for LPRng added BUT STILL UNTESTED.
-#
-# Revision 1.11  2003/04/10 21:47:20  jalet
-# Job history added. Upgrade script neutralized for now !
-#
-# Revision 1.10  2003/03/29 13:45:27  jalet
-# GPL paragraphs were incorrectly (from memory) copied into the sources.
-# Two README files were added.
-# Upgrade script for PostgreSQL pre 1.01 schema was added.
-#
-# Revision 1.9  2003/02/17 22:55:01  jalet
-# More options can now be set per printer or globally :
-#
-#       admin
-#       adminmail
-#       gracedelay
-#       requester
-#
-# the printer option has priority when both are defined.
-#
-# Revision 1.8  2003/02/17 22:05:50  jalet
-# Storage backend now supports admin and user passwords (untested)
-#
-# Revision 1.7  2003/02/10 12:07:31  jalet
-# Now repykota should output the recorded total page number for each printer too.
-#
-# Revision 1.6  2003/02/09 13:05:43  jalet
-# Internationalization continues...
-#
-# Revision 1.5  2003/02/08 22:39:46  jalet
-# --reset command line option added
-#
-# Revision 1.4  2003/02/08 09:59:59  jalet
-# Added preliminary base class for all storages
-#
-# Revision 1.3  2003/02/05 22:10:29  jalet
-# Typos
-#
-# Revision 1.2  2003/02/05 22:02:22  jalet
-# __import__ statement didn't work as expected
-#
-# Revision 1.1  2003/02/05 21:28:17  jalet
-# Initial import into CVS
-#
 #
 #
Index: pykota/trunk/pykota/config.py
===================================================================
--- pykota/trunk/pykota/config.py (revision 2146)
+++ pykota/trunk/pykota/config.py (revision 2147)
@@ -20,244 +20,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.62  2005/02/19 18:16:06  jalet
-# Optimize print job parsing by avoiding to pass the job's datas through
-# PyKota's internal parser if the special construct "software()" is used
-# with no argument in the 'accounter' directive.
-#
-# Revision 1.61  2005/02/16 00:29:33  jalet
-# Fixed the maxdenybanners directive.
-# Introduced the denyduplicates directive.
-# Fixed some database related glitches.
-#
-# Revision 1.60  2005/02/14 23:39:50  jalet
-# Introduces the new 'trustjobsize' directive to workaround some printers
-# generating unstable internal page counter values when queried through SNMP.
-#
-# 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
-#
-# Revision 1.57  2004/11/22 21:53:38  jalet
-# Added the reject_unknown directive to pykota.conf to reject user/group
-# creation if user or group is unknown to the system
-#
-# Revision 1.56  2004/11/15 15:23:07  jalet
-# Strips spaces just in case
-#
-# Revision 1.55  2004/11/15 15:14:06  jalet
-# Preliminary integration of Matt's patch for banners.
-#
-# Revision 1.54  2004/10/25 14:12:25  jalet
-# For URGENT legal reasons (Italy), a new "privacy" directive was added to pykota.conf
-# to hide print jobs' title, filename, and options.
-#
-# Revision 1.53  2004/10/06 10:05:47  jalet
-# Minor changes to allow any PyKota administrator to launch enhanced versions
-# of the commands, and not only the root user.
-#
-# Revision 1.52  2004/09/29 20:20:52  jalet
-# Added the winbind_separator directive to pykota.conf to allow the admin to
-# strip out the Samba/Winbind domain name when users print.
-#
-# Revision 1.51  2004/08/31 23:29:53  jalet
-# Introduction of the new 'onaccountererror' configuration directive.
-# Small fix for software accounter's return code which can't be None anymore.
-# Make software and hardware accounting code look similar : will be factorized
-# later.
-#
-# Revision 1.50  2004/07/27 07:07:27  jalet
-# Typo : treshold ==> threshold
-#
-# Revision 1.49  2004/06/03 21:53:24  jalet
-# crashrecipient directive
-#
-# Revision 1.48  2004/05/24 22:45:49  jalet
-# New 'enforcement' directive added
-# Polling loop improvements
-#
-# Revision 1.47  2004/05/18 14:49:20  jalet
-# Big code changes to completely remove the need for "requester" directives,
-# jsut use "hardware(... your previous requester directive's content ...)"
-#
-# Revision 1.46  2004/05/13 13:59:28  jalet
-# Code simplifications
-#
-# Revision 1.45  2004/03/01 10:22:30  jalet
-# Can now extract per printer pre and post hooks from the configuration file
-#
-# Revision 1.44  2004/02/20 14:42:21  jalet
-# Experimental ldapcache directive added
-#
-# Revision 1.43  2004/02/19 14:20:21  jalet
-# maildomain pykota.conf directive added.
-# Small improvements on mail headers quality.
-#
-# Revision 1.42  2004/01/08 14:10:32  jalet
-# Copyright year changed.
-#
-# Revision 1.41  2003/11/29 20:06:20  jalet
-# Added 'utolower' configuration option to convert all usernames to
-# lowercase when printing. All database accesses are still and will
-# remain case sensitive though.
-#
-# Revision 1.40  2003/11/18 23:43:12  jalet
-# Mailto can be any external command now, as usual.
-#
-# Revision 1.39  2003/10/08 21:41:38  jalet
-# External policies for printers works !
-# We can now auto-add users on first print, and do other useful things if needed.
-#
-# Revision 1.38  2003/10/07 22:06:05  jalet
-# Preliminary code to disable job history
-#
-# Revision 1.37  2003/10/07 09:07:28  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.36  2003/10/02 20:23:18  jalet
-# Storage caching mechanism added.
-#
-# Revision 1.35  2003/07/29 09:54:03  jalet
-# Added configurable LDAP mail attribute support
-#
-# Revision 1.34  2003/07/28 09:11:12  jalet
-# PyKota now tries to add its attributes intelligently in existing LDAP
-# directories.
-#
-# Revision 1.33  2003/07/16 21:53:07  jalet
-# Really big modifications wrt new configuration file's location and content.
-#
-# Revision 1.32  2003/07/08 19:43:51  jalet
-# Configurable warning messages.
-# Poor man's treshold value added.
-#
-# Revision 1.31  2003/07/07 11:49:24  jalet
-# Lots of small fixes with the help of PyChecker
-#
-# Revision 1.30  2003/06/25 14:10:01  jalet
-# Hey, it may work (edpykota --reset excepted) !
-#
-# Revision 1.29  2003/06/14 22:44:21  jalet
-# More work on LDAP storage backend.
-#
-# Revision 1.28  2003/06/10 16:37:54  jalet
-# Deletion of the second user which is not needed anymore.
-# Added a debug configuration field in /etc/pykota.conf
-# All queries can now be sent to the logger in debug mode, this will
-# greatly help improve performance when time for this will come.
-#
-# Revision 1.27  2003/05/27 23:00:21  jalet
-# Big rewrite of external accounting methods.
-# Should work well now.
-#
-# Revision 1.26  2003/04/30 19:53:58  jalet
-# 1.05
-#
-# Revision 1.25  2003/04/30 13:36:40  jalet
-# Stupid accounting method was added.
-#
-# Revision 1.24  2003/04/29 18:37:54  jalet
-# Pluggable accounting methods (actually doesn't support external scripts)
-#
-# Revision 1.23  2003/04/24 11:53:48  jalet
-# Default policy for unknown users/groups is to DENY printing instead
-# of the previous default to ALLOW printing. This is to solve an accuracy
-# problem. If you set the policy to ALLOW, jobs printed by in nexistant user
-# (from PyKota's POV) will be charged to the next user who prints on the
-# same printer.
-#
-# Revision 1.22  2003/04/23 22:13:57  jalet
-# Preliminary support for LPRng added BUT STILL UNTESTED.
-#
-# Revision 1.21  2003/03/29 13:45:27  jalet
-# GPL paragraphs were incorrectly (from memory) copied into the sources.
-# Two README files were added.
-# Upgrade script for PostgreSQL pre 1.01 schema was added.
-#
-# Revision 1.20  2003/03/29 13:08:28  jalet
-# Configuration is now expected to be found in /etc/pykota.conf instead of
-# in /etc/cups/pykota.conf
-# Installation script can move old config files to the new location if needed.
-# Better error handling if configuration file is absent.
-#
-# Revision 1.19  2003/03/16 09:56:52  jalet
-# Mailto option now accepts some additional values which all mean that
-# nobody will receive any email message.
-# Mailto option now works. Version 1.01 is now officially out.
-#
-# Revision 1.18  2003/03/16 08:00:50  jalet
-# Default hard coded options are now used if they are not set in the
-# configuration file.
-#
-# Revision 1.17  2003/03/15 23:01:28  jalet
-# New mailto option in configuration file added.
-# No time to test this tonight (although it should work).
-#
-# Revision 1.16  2003/02/17 23:01:56  jalet
-# Typos
-#
-# Revision 1.15  2003/02/17 22:55:01  jalet
-# More options can now be set per printer or globally :
-#
-#       admin
-#       adminmail
-#       gracedelay
-#       requester
-#
-# the printer option has priority when both are defined.
-#
-# Revision 1.14  2003/02/17 22:05:50  jalet
-# Storage backend now supports admin and user passwords (untested)
-#
-# Revision 1.13  2003/02/10 11:47:39  jalet
-# Moved some code down into the requesters
-#
-# Revision 1.12  2003/02/10 10:36:33  jalet
-# Small problem wrt external requester
-#
-# Revision 1.11  2003/02/10 08:50:45  jalet
-# External requester seems to be finally ok now
-#
-# Revision 1.10  2003/02/10 08:19:57  jalet
-# tell ConfigParser to return raw data, this allows our own strings
-# interpolations in the requester
-#
-# Revision 1.9  2003/02/10 00:44:38  jalet
-# Typos
-#
-# Revision 1.8  2003/02/10 00:42:17  jalet
-# External requester should be ok (untested)
-# New syntax for configuration file wrt requesters
-#
-# Revision 1.7  2003/02/09 13:05:43  jalet
-# Internationalization continues...
-#
-# Revision 1.6  2003/02/07 22:00:09  jalet
-# Bad cut&paste
-#
-# Revision 1.5  2003/02/06 23:58:05  jalet
-# repykota should be ok
-#
-# Revision 1.4  2003/02/06 09:19:02  jalet
-# More robust behavior (hopefully) when the user or printer is not managed
-# correctly by the Quota System : e.g. cupsFilter added in ppd file, but
-# printer and/or user not 'yet?' in storage.
-#
-# Revision 1.3  2003/02/05 23:26:22  jalet
-# Incorrect handling of grace delay
-#
-# Revision 1.2  2003/02/05 23:09:20  jalet
-# Name conflict
-#
-# Revision 1.1  2003/02/05 21:28:17  jalet
-# Initial import into CVS
-#
 #
 #
Index: pykota/trunk/pykota/loggers/stderr.py
===================================================================
--- pykota/trunk/pykota/loggers/stderr.py (revision 2146)
+++ pykota/trunk/pykota/loggers/stderr.py (revision 2147)
@@ -21,29 +21,4 @@
 # $Id$
 #
-# $Log$
-# Revision 1.7  2004/05/24 11:59:49  jalet
-# More robust (?) code
-#
-# Revision 1.6  2004/05/07 14:43:44  jalet
-# Now logs the PID too
-#
-# Revision 1.5  2004/01/08 14:10:33  jalet
-# Copyright year changed.
-#
-# Revision 1.4  2003/10/07 09:07:29  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.3  2003/04/23 22:13:57  jalet
-# Preliminary support for LPRng added BUT STILL UNTESTED.
-#
-# Revision 1.2  2003/03/29 13:45:27  jalet
-# GPL paragraphs were incorrectly (from memory) copied into the sources.
-# Two README files were added.
-# Upgrade script for PostgreSQL pre 1.01 schema was added.
-#
-# Revision 1.1  2003/02/05 21:28:17  jalet
-# Initial import into CVS
-#
-#
 #
 
Index: pykota/trunk/pykota/loggers/system.py
===================================================================
--- pykota/trunk/pykota/loggers/system.py (revision 2146)
+++ pykota/trunk/pykota/loggers/system.py (revision 2147)
@@ -20,41 +20,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.11  2004/05/24 11:59:51  jalet
-# More robust (?) code
-#
-# Revision 1.10  2004/05/07 14:43:46  jalet
-# Now logs the PID too
-#
-# Revision 1.9  2004/01/08 14:10:33  jalet
-# Copyright year changed.
-#
-# Revision 1.8  2003/10/07 09:07:29  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.7  2003/07/07 11:49:24  jalet
-# Lots of small fixes with the help of PyChecker
-#
-# Revision 1.6  2003/04/23 22:13:57  jalet
-# Preliminary support for LPRng added BUT STILL UNTESTED.
-#
-# Revision 1.5  2003/03/29 13:45:27  jalet
-# GPL paragraphs were incorrectly (from memory) copied into the sources.
-# Two README files were added.
-# Upgrade script for PostgreSQL pre 1.01 schema was added.
-#
-# Revision 1.4  2003/02/27 23:48:41  jalet
-# Correctly maps PyKota's log levels to syslog log levels
-#
-# Revision 1.3  2003/02/27 22:55:20  jalet
-# WARN log priority doesn't exist.
-#
-# Revision 1.2  2003/02/05 23:47:54  jalet
-# Forgotten default argument
-#
-# Revision 1.1  2003/02/05 23:09:20  jalet
-# Name conflict
-#
 #
 #
Index: pykota/trunk/pykota/tool.py
===================================================================
--- pykota/trunk/pykota/tool.py (revision 2146)
+++ pykota/trunk/pykota/tool.py (revision 2147)
@@ -20,529 +20,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.151  2005/02/22 17:56:58  jalet
-# Now logs the type of user running the command : mere mortal vs PyKota Admin
-#
-# Revision 1.150  2005/02/14 22:53:44  jalet
-# Now always precomputes the job's size with the internal PDL parser, and not
-# only when 'enforcement: strict' was set in pykota.conf
-#
-# 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
-# raw mode with CUPS.
-#
-# Revision 1.147  2005/01/06 22:52:53  jalet
-# Implemented the dropping of priviledges. Beware, beware...
-#
-# Revision 1.146  2004/12/09 23:03:57  jalet
-# Fixed a bug when pkbanner's output was piped into another command (e.g. gs)
-#
-# Revision 1.145  2004/11/27 22:52:07  jalet
-# Now PyKota searches its configuration files first in system user pykota's
-# home directory
-#
-# Revision 1.144  2004/11/18 06:01:53  jalet
-# Fix for the fix
-#
-# Revision 1.143  2004/11/18 05:54:15  jalet
-# Fix problem with spaces at the end of filenames in LPRng
-#
-# Revision 1.142  2004/11/16 23:15:05  jalet
-# Fix for LPRng job's file detection code
-#
-# Revision 1.141  2004/11/15 22:01:34  jalet
-# Improved banner handling.
-# Fix for raw printing and banners.
-#
-# Revision 1.140  2004/11/15 19:59:34  jalet
-# PyKota banners now basically work !
-#
-# Revision 1.139  2004/11/15 15:54:03  jalet
-# Continued integration of Matt's patch for banners
-#
-# Revision 1.138  2004/11/12 23:46:44  jalet
-# Heavy work on pkbanner. Not finished yet though, but mostly works.
-#
-# Revision 1.137  2004/11/01 16:21:17  jalet
-# Little change for locale+gettext
-#
-# Revision 1.136  2004/10/24 09:06:46  jalet
-# Added debug messages for LPRng support possible problem ???
-#
-# Revision 1.135  2004/10/20 14:29:30  jalet
-# Now logs something when locale settings are incorrect.
-#
-# Revision 1.134  2004/10/20 08:12:27  jalet
-# Another fix for charset detection and Python2.3
-#
-# Revision 1.133  2004/10/19 22:24:00  jalet
-# Should fix the printer's hostname or IP address detection code.
-#
-# Revision 1.132  2004/10/19 21:45:25  jalet
-# Now correctly logs command line arguments
-#
-# Revision 1.131  2004/10/19 21:37:57  jalet
-# Fixes recently introduced bug
-#
-# Revision 1.130  2004/10/19 15:21:48  jalet
-# Fixed incorrect setting of the user's locale
-#
-# Revision 1.129  2004/10/13 20:51:27  jalet
-# Made debugging levels be the same in cupspykota and lprngpykota.
-# Now outputs more information in informational messages : user, printer, jobid
-#
-# Revision 1.128  2004/10/11 22:53:06  jalet
-# Postponed string interpolation to help message's output method
-#
-# Revision 1.127  2004/10/11 12:48:38  jalet
-# Adds fake translation marker
-#
-# Revision 1.126  2004/10/05 09:41:13  jalet
-# Small fix for errors caused by unknown locale
-#
-# Revision 1.125  2004/10/04 11:18:10  jalet
-# Now exports the MD5 sum of the job's datas as an hexadecimal digest
-#
-# Revision 1.124  2004/10/02 05:48:56  jalet
-# Should now correctly deal with charsets both when storing into databases and when
-# retrieving datas. Works with both PostgreSQL and LDAP.
-#
-# Revision 1.123  2004/09/29 20:20:52  jalet
-# Added the winbind_separator directive to pykota.conf to allow the admin to
-# strip out the Samba/Winbind domain name when users print.
-#
-# Revision 1.122  2004/09/28 21:38:56  jalet
-# Now computes the job's datas MD5 checksum to later forbid duplicate print jobs.
-# The checksum is not yet saved into the database.
-#
-# Revision 1.121  2004/09/15 18:47:58  jalet
-# Re-Extends the list of invalid characters in names to prevent
-# people from adding user "*" for example, or to prevent
-# print administrators to hijack the system by putting dangerous
-# datas into the database which would cause commands later run by root
-# to compromise the system.
-#
-# Revision 1.120  2004/09/02 13:26:29  jalet
-# Small fix for old versions of LPRng
-#
-# Revision 1.119  2004/09/02 13:09:58  jalet
-# Now exports PYKOTAPRINTERHOSTNAME
-#
-# Revision 1.118  2004/08/06 20:46:45  jalet
-# Finished group quota fix for balance when no user in group has a balance
-#
-# Revision 1.117  2004/08/06 13:45:51  jalet
-# Fixed french translation problem.
-# Fixed problem with group quotas and strict enforcement.
-#
-# Revision 1.116  2004/07/24 20:20:29  jalet
-# Unitialized variable
-#
-# Revision 1.115  2004/07/21 09:35:48  jalet
-# Software accounting seems to be OK with LPRng support now
-#
-# Revision 1.114  2004/07/20 22:19:45  jalet
-# Sanitized a bit + use of gettext
-#
-# Revision 1.113  2004/07/17 20:37:27  jalet
-# Missing file... Am I really stupid ?
-#
-# Revision 1.112  2004/07/16 12:22:47  jalet
-# LPRng support early version
-#
-# Revision 1.111  2004/07/06 18:09:42  jalet
-# Reduced the set of invalid characters in names
-#
-# Revision 1.110  2004/07/01 19:56:42  jalet
-# Better dispatching of error messages
-#
-# Revision 1.109  2004/07/01 17:45:49  jalet
-# Added code to handle the description field for printers
-#
-# Revision 1.108  2004/06/24 23:09:30  jalet
-# Also prints read size on last block
-#
-# Revision 1.107  2004/06/23 13:03:28  jalet
-# Catches accounter configuration errors earlier
-#
-# Revision 1.106  2004/06/22 09:31:18  jalet
-# Always send some debug info to CUPS' back channel stream (stderr) as
-# informationnal messages.
-#
-# Revision 1.105  2004/06/21 08:17:38  jalet
-# Added version number in subject message for directive crashrecipient.
-#
-# Revision 1.104  2004/06/18 13:34:49  jalet
-# Now all tracebacks include PyKota's version number
-#
-# Revision 1.103  2004/06/18 13:17:26  jalet
-# Now includes PyKota's version number in messages sent by the crashrecipient
-# directive.
-#
-# Revision 1.102  2004/06/17 13:26:51  jalet
-# Better exception handling code
-#
-# Revision 1.101  2004/06/16 20:56:34  jalet
-# Smarter initialisation code
-#
-# Revision 1.100  2004/06/11 08:16:03  jalet
-# More exceptions catched in case of very early failure.
-#
-# Revision 1.99  2004/06/11 07:07:38  jalet
-# Now detects and logs configuration syntax errors instead of failing without
-# any notice message.
-#
-# Revision 1.98  2004/06/08 19:27:12  jalet
-# Doesn't ignore SIGCHLD anymore
-#
-# Revision 1.97  2004/06/07 22:45:35  jalet
-# Now accepts a job when enforcement is STRICT and predicted account balance
-# is equal to 0.0 : since the job hasn't been printed yet, only its printing
-# will really render balance equal to 0.0, so we should be allowed to print.
-#
-# Revision 1.96  2004/06/05 22:18:04  jalet
-# Now catches some exceptions earlier.
-# storage.py and ldapstorage.py : removed old comments
-#
-# Revision 1.95  2004/06/03 21:50:34  jalet
-# Improved error logging.
-# crashrecipient directive added.
-# Now exports the job's size in bytes too.
-#
-# Revision 1.94  2004/06/03 08:51:03  jalet
-# logs job's size in bytes now
-#
-# Revision 1.93  2004/06/02 21:51:02  jalet
-# Moved the sigterm capturing elsewhere
-#
-# Revision 1.92  2004/06/02 13:21:38  jalet
-# Debug message added
-#
-# Revision 1.91  2004/05/25 05:17:52  jalet
-# Now precomputes the job's size only if current printer's enforcement
-# is "STRICT"
-#
-# Revision 1.90  2004/05/24 22:45:49  jalet
-# New 'enforcement' directive added
-# Polling loop improvements
-#
-# Revision 1.89  2004/05/21 22:02:52  jalet
-# Preliminary work on pre-accounting
-#
-# Revision 1.88  2004/05/18 14:49:20  jalet
-# Big code changes to completely remove the need for "requester" directives,
-# jsut use "hardware(... your previous requester directive's content ...)"
-#
-# Revision 1.87  2004/05/17 19:14:59  jalet
-# Now catches SIGPIPE and SIGCHLD
-#
-# Revision 1.86  2004/05/13 13:59:28  jalet
-# Code simplifications
-#
-# Revision 1.85  2004/05/11 08:26:27  jalet
-# Now catches connection problems to SMTP server
-#
-# Revision 1.84  2004/04/21 08:36:32  jalet
-# Exports the PYKOTASTATUS environment variable when SIGTERM is received.
-#
-# Revision 1.83  2004/04/16 17:03:49  jalet
-# The list of printers groups the current printer is a member of is
-# now exported in the PYKOTAPGROUPS environment variable
-#
-# Revision 1.82  2004/04/13 09:38:03  jalet
-# More work on correct child processes handling
-#
-# Revision 1.81  2004/04/09 22:24:47  jalet
-# Began work on correct handling of child processes when jobs are cancelled by
-# the user. Especially important when an external requester is running for a
-# long time.
-#
-# Revision 1.80  2004/04/06 12:00:21  jalet
-# uninitialized values caused problems
-#
-# Revision 1.79  2004/03/28 21:01:29  jalet
-# PYKOTALIMITBY environment variable is now exported too
-#
-# Revision 1.78  2004/03/08 20:13:25  jalet
-# Allow names to begin with a digit
-#
-# Revision 1.77  2004/03/03 13:10:35  jalet
-# Now catches all smtplib exceptions when there's a problem sending messages
-#
-# Revision 1.76  2004/03/01 14:34:15  jalet
-# PYKOTAPHASE wasn't set at the right time at the end of data transmission
-# to underlying layer (real backend)
-#
-# Revision 1.75  2004/03/01 11:23:25  jalet
-# Pre and Post hooks to external commands are available in the cupspykota
-# backend. Forthe pykota filter they will be implemented real soon now.
-#
-# Revision 1.74  2004/02/26 14:18:07  jalet
-# Should fix the remaining bugs wrt printers groups and users groups.
-#
-# Revision 1.73  2004/02/19 14:20:21  jalet
-# maildomain pykota.conf directive added.
-# Small improvements on mail headers quality.
-#
-# Revision 1.72  2004/01/14 15:51:19  jalet
-# Docstring added.
-#
-# Revision 1.71  2004/01/11 23:22:42  jalet
-# Major code refactoring, it's way cleaner, and now allows automated addition
-# of printers on first print.
-#
-# Revision 1.70  2004/01/08 14:10:32  jalet
-# Copyright year changed.
-#
-# Revision 1.69  2004/01/05 16:02:18  jalet
-# Dots in user, groups and printer names should be allowed.
-#
-# Revision 1.68  2004/01/02 17:38:40  jalet
-# This time it should be better...
-#
-# Revision 1.67  2004/01/02 17:37:09  jalet
-# I'm completely stupid !!! Better to not talk while coding !
-#
-# Revision 1.66  2004/01/02 17:31:26  jalet
-# Forgot to remove some code
-#
-# Revision 1.65  2003/12/06 08:14:38  jalet
-# Added support for CUPS device uris which contain authentication information.
-#
-# Revision 1.64  2003/11/29 22:03:17  jalet
-# Some code refactoring work. New code is not used at this time.
-#
-# Revision 1.63  2003/11/29 20:06:20  jalet
-# Added 'utolower' configuration option to convert all usernames to
-# lowercase when printing. All database accesses are still and will
-# remain case sensitive though.
-#
-# Revision 1.62  2003/11/25 22:37:22  jalet
-# Small code move
-#
-# Revision 1.61  2003/11/25 22:03:28  jalet
-# No more message on stderr when the translation is not available.
-#
-# Revision 1.60  2003/11/25 21:54:05  jalet
-# updated FAQ
-#
-# Revision 1.59  2003/11/25 13:33:43  jalet
-# Puts 'root' instead of '' when printing from CUPS web interface (which
-# gives an empty username)
-#
-# Revision 1.58  2003/11/21 14:28:45  jalet
-# More complete job history.
-#
-# Revision 1.57  2003/11/19 23:19:38  jalet
-# Code refactoring work.
-# Explicit redirection to /dev/null has to be set in external policy now, just
-# like in external mailto.
-#
-# Revision 1.56  2003/11/19 07:40:20  jalet
-# Missing import statement.
-# Better documentation for mailto: external(...)
-#
-# Revision 1.55  2003/11/18 23:43:12  jalet
-# Mailto can be any external command now, as usual.
-#
-# Revision 1.54  2003/10/24 21:52:46  jalet
-# Now can force language when coming from CGI script.
-#
-# Revision 1.53  2003/10/08 21:41:38  jalet
-# External policies for printers works !
-# We can now auto-add users on first print, and do other useful things if needed.
-#
-# Revision 1.52  2003/10/07 09:07:28  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.51  2003/10/06 14:21:41  jalet
-# Test reversed to not retrieve group members when no messages for them.
-#
-# Revision 1.50  2003/10/02 20:23:18  jalet
-# Storage caching mechanism added.
-#
-# Revision 1.49  2003/07/29 20:55:17  jalet
-# 1.14 is out !
-#
-# Revision 1.48  2003/07/21 23:01:56  jalet
-# Modified some messages aout soft limit
-#
-# Revision 1.47  2003/07/16 21:53:08  jalet
-# Really big modifications wrt new configuration file's location and content.
-#
-# Revision 1.46  2003/07/09 20:17:07  jalet
-# Email field added to PostgreSQL schema
-#
-# Revision 1.45  2003/07/08 19:43:51  jalet
-# Configurable warning messages.
-# Poor man's treshold value added.
-#
-# Revision 1.44  2003/07/07 11:49:24  jalet
-# Lots of small fixes with the help of PyChecker
-#
-# Revision 1.43  2003/07/04 09:06:32  jalet
-# Small bug fix wrt undefined "LimitBy" field.
-#
-# Revision 1.42  2003/06/30 12:46:15  jalet
-# Extracted reporting code.
-#
-# Revision 1.41  2003/06/25 14:10:01  jalet
-# Hey, it may work (edpykota --reset excepted) !
-#
-# Revision 1.40  2003/06/10 16:37:54  jalet
-# Deletion of the second user which is not needed anymore.
-# Added a debug configuration field in /etc/pykota.conf
-# All queries can now be sent to the logger in debug mode, this will
-# greatly help improve performance when time for this will come.
-#
-# Revision 1.39  2003/04/29 18:37:54  jalet
-# Pluggable accounting methods (actually doesn't support external scripts)
-#
-# Revision 1.38  2003/04/24 11:53:48  jalet
-# Default policy for unknown users/groups is to DENY printing instead
-# of the previous default to ALLOW printing. This is to solve an accuracy
-# problem. If you set the policy to ALLOW, jobs printed by in nexistant user
-# (from PyKota's POV) will be charged to the next user who prints on the
-# same printer.
-#
-# Revision 1.37  2003/04/24 08:08:27  jalet
-# Debug message forgotten
-#
-# Revision 1.36  2003/04/24 07:59:40  jalet
-# LPRng support now works !
-#
-# Revision 1.35  2003/04/23 22:13:57  jalet
-# Preliminary support for LPRng added BUT STILL UNTESTED.
-#
-# Revision 1.34  2003/04/17 09:26:21  jalet
-# repykota now reports account balances too.
-#
-# Revision 1.33  2003/04/16 12:35:49  jalet
-# Groups quota work now !
-#
-# Revision 1.32  2003/04/16 08:53:14  jalet
-# Printing can now be limited either by user's account balance or by
-# page quota (the default). Quota report doesn't include account balance
-# yet, though.
-#
-# Revision 1.31  2003/04/15 11:30:57  jalet
-# More work done on money print charging.
-# Minor bugs corrected.
-# All tools now access to the storage as priviledged users, repykota excepted.
-#
-# Revision 1.30  2003/04/10 21:47:20  jalet
-# Job history added. Upgrade script neutralized for now !
-#
-# Revision 1.29  2003/03/29 13:45:27  jalet
-# GPL paragraphs were incorrectly (from memory) copied into the sources.
-# Two README files were added.
-# Upgrade script for PostgreSQL pre 1.01 schema was added.
-#
-# Revision 1.28  2003/03/29 13:08:28  jalet
-# Configuration is now expected to be found in /etc/pykota.conf instead of
-# in /etc/cups/pykota.conf
-# Installation script can move old config files to the new location if needed.
-# Better error handling if configuration file is absent.
-#
-# Revision 1.27  2003/03/15 23:01:28  jalet
-# New mailto option in configuration file added.
-# No time to test this tonight (although it should work).
-#
-# Revision 1.26  2003/03/09 23:58:16  jalet
-# Comment
-#
-# Revision 1.25  2003/03/07 22:56:14  jalet
-# 0.99 is out with some bug fixes.
-#
-# Revision 1.24  2003/02/27 23:48:41  jalet
-# Correctly maps PyKota's log levels to syslog log levels
-#
-# Revision 1.23  2003/02/27 22:55:20  jalet
-# WARN log priority doesn't exist.
-#
-# Revision 1.22  2003/02/27 09:09:20  jalet
-# Added a method to match strings against wildcard patterns
-#
-# Revision 1.21  2003/02/17 23:01:56  jalet
-# Typos
-#
-# Revision 1.20  2003/02/17 22:55:01  jalet
-# More options can now be set per printer or globally :
-#
-#       admin
-#       adminmail
-#       gracedelay
-#       requester
-#
-# the printer option has priority when both are defined.
-#
-# Revision 1.19  2003/02/10 11:28:45  jalet
-# Localization
-#
-# Revision 1.18  2003/02/10 01:02:17  jalet
-# External requester is about to work, but I must sleep
-#
-# Revision 1.17  2003/02/09 13:05:43  jalet
-# Internationalization continues...
-#
-# Revision 1.16  2003/02/09 12:56:53  jalet
-# Internationalization begins...
-#
-# Revision 1.15  2003/02/08 22:09:52  jalet
-# Name check method moved here
-#
-# Revision 1.14  2003/02/07 10:42:45  jalet
-# Indentation problem
-#
-# Revision 1.13  2003/02/07 08:34:16  jalet
-# Test wrt date limit was wrong
-#
-# Revision 1.12  2003/02/06 23:20:02  jalet
-# warnpykota doesn't need any user/group name argument, mimicing the
-# warnquota disk quota tool.
-#
-# Revision 1.11  2003/02/06 22:54:33  jalet
-# warnpykota should be ok
-#
-# Revision 1.10  2003/02/06 15:03:11  jalet
-# added a method to set the limit date
-#
-# Revision 1.9  2003/02/06 10:39:23  jalet
-# Preliminary edpykota work.
-#
-# Revision 1.8  2003/02/06 09:19:02  jalet
-# More robust behavior (hopefully) when the user or printer is not managed
-# correctly by the Quota System : e.g. cupsFilter added in ppd file, but
-# printer and/or user not 'yet?' in storage.
-#
-# Revision 1.7  2003/02/06 00:00:45  jalet
-# Now includes the printer name in email messages
-#
-# Revision 1.6  2003/02/05 23:55:02  jalet
-# Cleaner email messages
-#
-# Revision 1.5  2003/02/05 23:45:09  jalet
-# Better DateTime manipulation wrt grace delay
-#
-# Revision 1.4  2003/02/05 23:26:22  jalet
-# Incorrect handling of grace delay
-#
-# Revision 1.3  2003/02/05 22:16:20  jalet
-# DEVICE_URI is undefined outside of CUPS, i.e. for normal command line tools
-#
-# Revision 1.2  2003/02/05 22:10:29  jalet
-# Typos
-#
-# Revision 1.1  2003/02/05 21:28:17  jalet
-# Initial import into CVS
-#
 #
 #
Index: pykota/trunk/pykota/logger.py
===================================================================
--- pykota/trunk/pykota/logger.py (revision 2146)
+++ pykota/trunk/pykota/logger.py (revision 2147)
@@ -21,47 +21,4 @@
 # $Id$
 #
-# $Log$
-# Revision 1.12  2004/01/08 14:10:32  jalet
-# Copyright year changed.
-#
-# Revision 1.11  2003/12/27 16:49:25  uid67467
-# Should be ok now.
-#
-# Revision 1.10  2003/11/25 22:37:22  jalet
-# Small code move
-#
-# Revision 1.9  2003/10/07 09:07:28  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.8  2003/07/07 11:49:24  jalet
-# Lots of small fixes with the help of PyChecker
-#
-# Revision 1.7  2003/06/10 16:37:54  jalet
-# Deletion of the second user which is not needed anymore.
-# Added a debug configuration field in /etc/pykota.conf
-# All queries can now be sent to the logger in debug mode, this will
-# greatly help improve performance when time for this will come.
-#
-# Revision 1.6  2003/04/23 22:13:57  jalet
-# Preliminary support for LPRng added BUT STILL UNTESTED.
-#
-# Revision 1.5  2003/03/29 13:45:27  jalet
-# GPL paragraphs were incorrectly (from memory) copied into the sources.
-# Two README files were added.
-# Upgrade script for PostgreSQL pre 1.01 schema was added.
-#
-# Revision 1.4  2003/02/09 13:05:43  jalet
-# Internationalization continues...
-#
-# Revision 1.3  2003/02/05 22:10:29  jalet
-# Typos
-#
-# Revision 1.2  2003/02/05 22:02:22  jalet
-# __import__ statement didn't work as expected
-#
-# Revision 1.1  2003/02/05 21:28:17  jalet
-# Initial import into CVS
-#
-#
 #
 
Index: pykota/trunk/pykota/accounters/software.py
===================================================================
--- pykota/trunk/pykota/accounters/software.py (revision 2146)
+++ pykota/trunk/pykota/accounters/software.py (revision 2147)
@@ -20,53 +20,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.12  2005/02/19 18:16:06  jalet
-# Optimize print job parsing by avoiding to pass the job's datas through
-# PyKota's internal parser if the special construct "software()" is used
-# with no argument in the 'accounter' directive.
-#
-# Revision 1.11  2004/09/24 21:19:48  jalet
-# Did a pass of PyChecker
-#
-# Revision 1.10  2004/08/31 23:29:53  jalet
-# Introduction of the new 'onaccountererror' configuration directive.
-# Small fix for software accounter's return code which can't be None anymore.
-# Make software and hardware accounting code look similar : will be factorized
-# later.
-#
-# Revision 1.9  2004/08/25 22:34:39  jalet
-# Now both software and hardware accounting raise an exception when no valid
-# result can be extracted from the subprocess' output.
-# Hardware accounting now reads subprocess' output until an integer is read
-# or data is exhausted : it now behaves just like software accounting in this
-# aspect.
-#
-# Revision 1.8  2004/08/22 14:04:47  jalet
-# Tries to fix problem with subprocesses outputting more datas than needed
-#
-# Revision 1.7  2004/08/06 13:45:51  jalet
-# Fixed french translation problem.
-# Fixed problem with group quotas and strict enforcement.
-#
-# Revision 1.6  2004/07/01 19:56:43  jalet
-# Better dispatching of error messages
-#
-# Revision 1.5  2004/06/10 22:42:06  jalet
-# Better messages in logs
-#
-# Revision 1.4  2004/06/02 21:51:14  jalet
-# Moved the sigterm capturing elsewhere
-#
-# Revision 1.3  2004/05/24 22:45:49  jalet
-# New 'enforcement' directive added
-# Polling loop improvements
-#
-# Revision 1.2  2004/05/18 14:49:23  jalet
-# Big code changes to completely remove the need for "requester" directives,
-# jsut use "hardware(... your previous requester directive's content ...)"
-#
-# Revision 1.1  2004/05/13 13:59:30  jalet
-# Code simplifications
 #
 #
Index: pykota/trunk/pykota/accounters/hardware.py
===================================================================
--- pykota/trunk/pykota/accounters/hardware.py (revision 2146)
+++ pykota/trunk/pykota/accounters/hardware.py (revision 2147)
@@ -20,126 +20,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.36  2005/02/20 22:58:55  jalet
-# Added some informations from RFC3805 and RFC2790
-#
-# Revision 1.35  2005/01/12 22:44:06  jalet
-# Tried to fix a problem with printers which are slow to pass into printing mode.
-#
-# Revision 1.34  2004/11/19 11:57:51  jalet
-# Modified the SNMP fix as hinted by pysnmp's maintainer
-#
-# Revision 1.33  2004/11/19 10:35:37  jalet
-# Catches TypeMismatchError in SNMP answer handling code
-#
-# Revision 1.32  2004/11/16 23:23:40  jalet
-# Fixed internal PJL handling wrt the 35078 PowerSave mode.
-#
-# Revision 1.31  2004/11/01 14:32:26  jalet
-# Fix for unneeded out of band status in pjl_over_tcp/9100
-#
-# Revision 1.30  2004/10/05 09:21:34  jalet
-# Removed misleading comments
-#
-# Revision 1.29  2004/10/05 09:20:07  jalet
-# Reduced delay from 2 to 1 seconds in internal SNMP and PJL_over_TCP
-# handlers
-#
-# Revision 1.28  2004/09/27 20:09:30  jalet
-# Lowered timeout delay for PJL queries
-#
-# Revision 1.27  2004/09/27 20:00:35  jalet
-# Typo
-#
-# Revision 1.26  2004/09/27 19:56:27  jalet
-# Added internal handling for PJL queries over port tcp/9100. Now waits
-# for printer being idle before asking, just like with SNMP.
-#
-# Revision 1.25  2004/09/27 09:21:37  jalet
-# Now includes printer's hostname in SNMP error messages
-#
-# Revision 1.24  2004/09/24 21:19:48  jalet
-# Did a pass of PyChecker
-#
-# Revision 1.23  2004/09/23 19:18:12  jalet
-# Now loops when the external hardware accounter fails, until it returns a correct value
-#
-# Revision 1.22  2004/09/22 19:48:01  jalet
-# Logs the looping message as debug instead of as info
-#
-# Revision 1.21  2004/09/22 19:27:41  jalet
-# Bad import statement
-#
-# Revision 1.20  2004/09/22 19:22:27  jalet
-# Just loop in case a network error occur
-#
-# Revision 1.19  2004/09/22 14:29:01  jalet
-# Fixed nasty typo
-#
-# Revision 1.18  2004/09/21 16:00:46  jalet
-# More informational messages
-#
-# Revision 1.17  2004/09/21 13:42:18  jalet
-# Typo
-#
-# Revision 1.16  2004/09/21 13:30:53  jalet
-# First try at full SNMP handling from the Python code.
-#
-# Revision 1.15  2004/09/14 11:38:59  jalet
-# Minor fix
-#
-# Revision 1.14  2004/09/14 06:53:53  jalet
-# Small test added
-#
-# Revision 1.13  2004/09/13 16:02:45  jalet
-# Added fix for incorrect job's size when hardware accounting fails
-#
-# Revision 1.12  2004/09/06 15:42:34  jalet
-# Fix missing import statement for the signal module
-#
-# Revision 1.11  2004/08/31 23:29:53  jalet
-# Introduction of the new 'onaccountererror' configuration directive.
-# Small fix for software accounter's return code which can't be None anymore.
-# Make software and hardware accounting code look similar : will be factorized
-# later.
-#
-# Revision 1.10  2004/08/27 22:49:04  jalet
-# No answer from subprocess now is really a fatal error. Waiting for some
-# time to make this configurable...
-#
-# Revision 1.9  2004/08/25 22:34:39  jalet
-# Now both software and hardware accounting raise an exception when no valid
-# result can be extracted from the subprocess' output.
-# Hardware accounting now reads subprocess' output until an integer is read
-# or data is exhausted : it now behaves just like software accounting in this
-# aspect.
-#
-# Revision 1.8  2004/07/22 22:41:48  jalet
-# Hardware accounting for LPRng should be OK now. UNTESTED.
-#
-# Revision 1.7  2004/07/16 12:22:47  jalet
-# LPRng support early version
-#
-# Revision 1.6  2004/07/01 19:56:42  jalet
-# Better dispatching of error messages
-#
-# Revision 1.5  2004/06/10 22:42:06  jalet
-# Better messages in logs
-#
-# Revision 1.4  2004/05/24 22:45:49  jalet
-# New 'enforcement' directive added
-# Polling loop improvements
-#
-# Revision 1.3  2004/05/24 14:36:40  jalet
-# Revert to old polling loop. Will need optimisations
-#
-# Revision 1.2  2004/05/18 14:49:22  jalet
-# Big code changes to completely remove the need for "requester" directives,
-# jsut use "hardware(... your previous requester directive's content ...)"
-#
-# Revision 1.1  2004/05/13 13:59:30  jalet
-# Code simplifications
-#
 #
 #
Index: pykota/trunk/pykota/accounter.py
===================================================================
--- pykota/trunk/pykota/accounter.py (revision 2146)
+++ pykota/trunk/pykota/accounter.py (revision 2147)
@@ -20,73 +20,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.21  2004/10/24 12:49:02  jalet
-# Fixed bad indentation
-#
-# Revision 1.20  2004/09/13 16:02:45  jalet
-# Added fix for incorrect job's size when hardware accounting fails
-#
-# Revision 1.19  2004/08/31 23:29:53  jalet
-# Introduction of the new 'onaccountererror' configuration directive.
-# Small fix for software accounter's return code which can't be None anymore.
-# Make software and hardware accounting code look similar : will be factorized
-# later.
-#
-# Revision 1.18  2004/07/22 22:41:48  jalet
-# Hardware accounting for LPRng should be OK now. UNTESTED.
-#
-# Revision 1.17  2004/07/16 12:22:47  jalet
-# LPRng support early version
-#
-# Revision 1.16  2004/05/25 09:15:15  jalet
-# accounter.py : old code deleted
-# the rest : now exports PYKOTAPRECOMPUTEDJOBSIZE and PYKOTAPRECOMPUTEDJOBPRICE
-#
-# Revision 1.15  2004/05/24 22:45:49  jalet
-# New 'enforcement' directive added
-# Polling loop improvements
-#
-# Revision 1.14  2004/05/18 14:49:19  jalet
-# Big code changes to completely remove the need for "requester" directives,
-# jsut use "hardware(... your previous requester directive's content ...)"
-#
-# Revision 1.13  2004/01/12 22:43:40  jalet
-# New formula to compute a job's price
-#
-# Revision 1.12  2004/01/11 23:43:31  jalet
-# Bug wrt number of copies with CUPS should be fixed.
-#
-# Revision 1.11  2004/01/11 23:22:42  jalet
-# Major code refactoring, it's way cleaner, and now allows automated addition
-# of printers on first print.
-#
-# Revision 1.10  2004/01/08 14:10:32  jalet
-# Copyright year changed.
-#
-# Revision 1.9  2003/12/27 16:49:25  uid67467
-# Should be ok now.
-#
-# Revision 1.7  2003/11/25 23:46:40  jalet
-# Don't try to verify if module name is valid, Python does this better than us.
-#
-# Revision 1.6  2003/11/12 23:28:55  jalet
-# More work on new backend. This commit may be unstable.
-#
-# Revision 1.5  2003/10/07 09:07:28  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.4  2003/07/14 14:14:59  jalet
-# Old template
-#
-# Revision 1.3  2003/04/30 19:53:58  jalet
-# 1.05
-#
-# Revision 1.2  2003/04/30 13:36:40  jalet
-# Stupid accounting method was added.
-#
-# Revision 1.1  2003/04/29 18:37:54  jalet
-# Pluggable accounting methods (actually doesn't support external scripts)
-#
 #
 #
Index: pykota/trunk/pykota/pdlanalyzer.py
===================================================================
--- pykota/trunk/pykota/pdlanalyzer.py (revision 2146)
+++ pykota/trunk/pykota/pdlanalyzer.py (revision 2147)
@@ -20,170 +20,4 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.52  2005/02/13 21:26:34  jalet
-# Better detection of number of copies in PostScript parser
-#
-# Revision 1.51  2005/01/12 14:44:27  jalet
-# Fixed a fuckingly strange exception by cleverly ignoring it entirely :-)
-#
-# Revision 1.50  2005/01/07 15:53:58  jalet
-# Another fix for PCL3/4/5
-#
-# Revision 1.49  2005/01/06 17:41:34  jalet
-# Of course if I forget some files during the commits, the software doesn't
-# work as expected ;-)
-#
-# Revision 1.48  2004/12/16 15:11:00  jalet
-# Added some debugging code to PCL3/4/5 parser
-#
-# Revision 1.47  2004/12/13 20:49:53  jalet
-# Bad typo
-#
-# Revision 1.46  2004/12/13 20:48:33  jalet
-# Outputs debug info to stderr
-#
-# Revision 1.45  2004/12/13 20:39:46  jalet
-# Added a --debug command line option to pkpgcounter, for people interested
-# in seeing what happens, and what will be available in the future :-)
-#
-# Revision 1.44  2004/11/17 15:10:31  jalet
-# Fixed Epson Stylus Photo problem in software accounting
-#
-# Revision 1.43  2004/11/13 20:52:26  jalet
-# Heavy work done on PCL3/4/5 and PCLXL job analyzis
-#
-# Revision 1.42  2004/09/24 21:19:48  jalet
-# Did a pass of PyChecker
-#
-# Revision 1.41  2004/09/04 14:18:55  jalet
-# Support for more laserjet models added.
-#
-# Revision 1.40  2004/09/04 14:01:47  jalet
-# Support for PCL3 (HP Deskjets) added to generic PDL parser
-#
-# Revision 1.39  2004/09/02 23:30:05  jalet
-# Comments
-#
-# Revision 1.38  2004/09/02 22:08:37  jalet
-# First draft of PCL3GUI analyzer.
-#
-# Revision 1.37  2004/09/02 21:22:49  jalet
-# One more PCL tag
-#
-# Revision 1.36  2004/09/01 22:31:49  jalet
-# Some more work on ESC/P2 analyzer to avoid missing \r\n sequences. Not
-# exactly optimal though...
-#
-# Revision 1.35  2004/08/30 23:10:24  jalet
-# Improved the ESC/P2 analyzer so that more GhostScript devices are supported
-#
-# Revision 1.34  2004/08/27 09:08:22  jalet
-# Improvement in PostScript parser to avoid being fooled by clever "students"
-#
-# Revision 1.33  2004/08/27 09:02:34  jalet
-# Forgot to remove some special debugging code...
-#
-# Revision 1.32  2004/08/27 08:58:50  jalet
-# Relax checks for PCL5 header to accomodate strange printer drivers
-#
-# Revision 1.31  2004/08/22 08:25:33  jalet
-# Improved ESC/P2 miniparser thanks to Paulo Silva
-#
-# Revision 1.30  2004/08/21 23:16:57  jalet
-# First draft of ESC/P2 (mini-)parser.
-#
-# Revision 1.29  2004/08/11 16:25:38  jalet
-# Fixed index problem in PCLXL parser when retrieving number of copies for
-# each page
-#
-# Revision 1.28  2004/08/10 23:01:49  jalet
-# Fixed number of copies in PCL5 parser
-#
-# Revision 1.27  2004/08/09 18:14:22  jalet
-# Added workaround for number of copies and some PostScript drivers
-#
-# Revision 1.26  2004/07/22 13:49:51  jalet
-# Added support for binary PostScript through GhostScript if native DSC
-# compliant PostScript analyzer doesn't find any page. This is much
-# slower though, so native analyzer is tried first.
-#
-# Revision 1.25  2004/07/10 14:06:36  jalet
-# Fix for Python2.1 incompatibilities
-#
-# Revision 1.24  2004/07/05 21:00:39  jalet
-# Fix for number of copies for each page in PCLXL parser
-#
-# Revision 1.23  2004/07/03 08:21:59  jalet
-# Testsuite for PDL Analyzer added
-#
-# Revision 1.22  2004/06/29 14:21:41  jalet
-# Smallish optimization
-#
-# Revision 1.21  2004/06/28 23:11:26  jalet
-# Code de-factorization in PCLXL parser
-#
-# Revision 1.20  2004/06/28 22:38:41  jalet
-# Increased speed by a factor of 2 in PCLXL parser
-#
-# Revision 1.19  2004/06/28 21:20:30  jalet
-# PCLXL support now works !
-#
-# Revision 1.18  2004/06/27 22:59:37  jalet
-# More work on PCLXL parser
-#
-# Revision 1.17  2004/06/26 23:20:01  jalet
-# Additionnal speedup for GhostScript generated PCL5 files
-#
-# Revision 1.16  2004/06/26 15:31:00  jalet
-# mmap reintroduced in PCL5 parser
-#
-# Revision 1.15  2004/06/26 14:14:31  jalet
-# Now uses Psyco if it is available
-#
-# Revision 1.14  2004/06/25 09:50:28  jalet
-# More debug info in PCLXL parser
-#
-# Revision 1.13  2004/06/25 08:10:08  jalet
-# Another fix for PCL5 parser
-#
-# Revision 1.12  2004/06/24 23:09:53  jalet
-# Fix for number of copies in PCL5 parser
-#
-# Revision 1.11  2004/06/23 22:07:50  jalet
-# Fixed PCL5 parser according to the sources of rastertohp
-#
-# Revision 1.10  2004/06/18 22:24:03  jalet
-# Removed old comments
-#
-# Revision 1.9  2004/06/18 22:21:27  jalet
-# Native PDF parser greatly improved.
-# GhostScript based PDF parser completely removed because native code
-# is now portable across Python versions.
-#
-# Revision 1.8  2004/06/18 20:49:46  jalet
-# "ERROR:" prefix added
-#
-# Revision 1.7  2004/06/18 17:48:04  jalet
-# Added native fast PDF parsing method
-#
-# Revision 1.6  2004/06/18 14:00:16  jalet
-# Added PDF support in smart PDL analyzer (through GhostScript for now)
-#
-# Revision 1.5  2004/06/18 10:09:05  jalet
-# Resets file pointer to start of file in all cases
-#
-# Revision 1.4  2004/06/18 06:16:14  jalet
-# Fixes PostScript detection code for incorrect drivers
-#
-# Revision 1.3  2004/05/21 20:40:08  jalet
-# All the code for pkpgcounter is now in pdlanalyzer.py
-#
-# Revision 1.2  2004/05/19 19:09:36  jalet
-# Speed improvement
-#
-# Revision 1.1  2004/05/18 09:59:54  jalet
-# pkpgcounter is now just a wrapper around the PDLAnalyzer class
-#
 #
 #
