Changeset 2147 for pykota/trunk

Timestamp:

03/06/05 17:52:43 (20 years ago)

Author:

jerome

Message:

Removed all references to $Log$

Location:

pykota/trunk

Files:

• bin/autopykota (modified) (1 diff)
• bin/cupspykota (modified) (1 diff)
• bin/dumpykota (modified) (1 diff)
• bin/edpykota (modified) (1 diff)
• bin/lprngpykota (modified) (1 diff)
• bin/pkbanner (modified) (1 diff)
• bin/pkhint (modified) (1 diff)
• bin/pkmail (modified) (1 diff)
• bin/pkpgcounter (modified) (1 diff)
• bin/pkprinters (modified) (1 diff)
• bin/pykosd (modified) (1 diff)
• bin/pykotme (modified) (1 diff)
• bin/repykota (modified) (1 diff)
• bin/warnpykota (modified) (1 diff)
• cgi-bin/dumpykota.cgi (modified) (1 diff)
• cgi-bin/printquota.cgi (modified) (1 diff)
• checkdeps.py (modified) (1 diff)
• contributed/pagecount.pl (modified) (1 diff)
• docs/autopykota.sgml (modified) (1 diff)
• docs/dumpykota.sgml (modified) (1 diff)
• docs/filterpykota.sgml (modified) (1 diff)
• docs/installation.sgml (modified) (1 diff)
• docs/pkhint.sgml (modified) (1 diff)
• docs/pkmail.sgml (modified) (1 diff)
• docs/pkprinters.sgml (modified) (1 diff)
• docs/pykosd.sgml (modified) (1 diff)
• docs/pykota.sgml (modified) (1 diff)
• docs/pykotme.sgml (modified) (1 diff)
• docs/repykota.sgml (modified) (1 diff)
• docs/scripts.sgml (modified) (1 diff)
• docs/warnpykota.sgml (modified) (1 diff)
• initscripts/mysql/pykota-mysql.sql (modified) (1 diff)
• initscripts/postgresql/pykota-postgresql.sql (modified) (1 diff)
• initscripts/postgresql/upgrade-to-1.14.sql (modified) (1 diff)
• initscripts/postgresql/upgrade-to-1.16.sql (modified) (1 diff)
• initscripts/postgresql/upgrade-to-1.19.sql (modified) (1 diff)
• initscripts/postgresql/upgrade-to-1.21.sql (modified) (1 diff)
• initscripts/postgresql/VERYOLDpykota-upgrade-postgresql.sql (modified) (1 diff)
• pykota/accounter.py (modified) (1 diff)
• pykota/accounters/hardware.py (modified) (1 diff)
• pykota/accounters/software.py (modified) (1 diff)
• pykota/cgifuncs.py (modified) (1 diff)
• pykota/config.py (modified) (1 diff)
• pykota/dumper.py (modified) (1 diff)
• pykota/ipp.py (modified) (1 diff)
• pykota/logger.py (modified) (1 diff)
• pykota/loggers/stderr.py (modified) (1 diff)
• pykota/loggers/system.py (modified) (1 diff)
• pykota/pdlanalyzer.py (modified) (1 diff)
• pykota/reporter.py (modified) (1 diff)
• pykota/reporters/html.py (modified) (1 diff)
• pykota/reporters/text.py (modified) (1 diff)
• pykota/storage.py (modified) (1 diff)
• pykota/storages/dbistorage.py (modified) (1 diff)
• pykota/storages/ldapstorage.py (modified) (1 diff)
• pykota/storages/pgstorage.py (modified) (1 diff)
• pykota/storages/sql.py (modified) (1 diff)
• pykota/tool.py (modified) (1 diff)
• setup.py (modified) (1 diff)

pykota/trunk/bin/autopykota

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.9  2005/01/17 08:44:23  jalet
-# Modified copyright years
-#
-# Revision 1.8  2004/10/21 22:21:21  jalet
-# Fixes a string interpolation problem
-#
-# Revision 1.7  2004/10/13 08:09:19  jalet
-# More complete PATH.
-# pkhint doesn't use absolute path to search for helper commands anymore.
-#
-# Revision 1.6  2004/10/11 22:53:05  jalet
-# Postponed string interpolation to help message's output method
-#
-# Revision 1.5  2004/10/11 22:08:06  jalet
-# Incorrect doc for autopykota
-#
-# Revision 1.4  2004/10/11 12:49:05  jalet
-# Renders help translatable
-#
-# Revision 1.3  2004/10/06 07:51:07  jalet
-# Now autopykota uses 0.0 as the default value for initial account balance
-# if the --initbalance command line option is not used.
-#
-# Revision 1.2  2004/09/30 11:22:30  jalet
-# Extends the PATH and doesn't use absolute path anymore to launch edpykota.
-#
-# Revision 1.1  2004/09/30 09:52:45  jalet
-# Initial release of autopykota. Reading help or manpage is greatly
-# encouraged !
-#
 #
 #

pykota/trunk/bin/cupspykota

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.89  2005/02/16 00:29:33  jalet
-# Fixed the maxdenybanners directive.
-# Introduced the denyduplicates directive.
-# Fixed some database related glitches.
-#
-# Revision 1.88  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.87  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.86  2005/02/13 22:48:37  jalet
-# Added the md5sum to the history
-#
-# Revision 1.85  2005/02/13 22:02:28  jalet
-# Big database structure changes. Upgrade script is now included as well as
-# the new LDAP schema.
-# Introduction of the -o | --overcharge command line option to edpykota.
-# The output of repykota is more complete, but doesn't fit in 80 columns anymore.
-# Introduction of the new 'maxdenybanners' directive.
-#
-# Revision 1.84  2005/01/17 08:44:23  jalet
-# Modified copyright years
-#
-# Revision 1.83  2005/01/06 23:23:35  jalet
-# Regain priviledge the time to read the job control file to extract the client
-# hostname
-#
-# Revision 1.82  2005/01/06 22:52:53  jalet
-# Implemented the dropping of priviledges. Beware, beware...
-#
-# Revision 1.81  2004/12/07 16:54:02  jalet
-# Now logs as errors differences between computed and precomputed job's sizes
-#
-# Revision 1.80  2004/11/15 22:12:46  jalet
-# Fix for the Fix !!!
-#
-# Revision 1.79  2004/11/15 22:01:34  jalet
-# Improved banner handling.
-# Fix for raw printing and banners.
-#
-# Revision 1.78  2004/11/15 19:59:34  jalet
-# PyKota banners now basically work !
-#
-# Revision 1.77  2004/11/06 22:40:57  jalet
-# Safer code
-#
-# Revision 1.76  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...
-#
-# Revision 1.75  2004/11/01 15:45:25  jalet
-# Added many debug messages.
-# Added some code to prevent short writes.
-#
-# Revision 1.74  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.73  2004/10/13 16:56:45  jalet
-# Added a space to the pattern to differentiate jobs which id begins with
-# the same digits, like jobs 87 and 879 for example : if printed by same
-# user on same printer, but from a different host this could have broken
-# the result. (In reality this couldn't happen because 879 would be the
-# last line to match anyway because of job ordering, but we never know
-# if the page_log file gets corrupt somewhat)
-#
-# Revision 1.72  2004/09/13 16:02:44  jalet
-# Added fix for incorrect job's size when hardware accounting fails
-#
-# Revision 1.71  2004/09/06 17:05:06  jalet
-# Fix for autodetection of SC_OPEN_MAX
-#
-# Revision 1.70  2004/07/26 09:20:27  jalet
-# Unneeded module
-#
-# Revision 1.69  2004/07/22 22:41:47  jalet
-# Hardware accounting for LPRng should be OK now. UNTESTED.
-#
-# Revision 1.68  2004/07/20 22:19:44  jalet
-# Sanitized a bit + use of gettext
-#
-# Revision 1.67  2004/07/16 12:22:45  jalet
-# LPRng support early version
-#
-# Revision 1.66  2004/07/01 19:56:25  jalet
-# Better dispatching of error messages
-#
-# Revision 1.65  2004/06/22 09:31:17  jalet
-# Always send some debug info to CUPS' back channel stream (stderr) as
-# informationnal messages.
-#
-# Revision 1.64  2004/06/18 13:34:46  jalet
-# Now all tracebacks include PyKota's version number
-#
-# Revision 1.63  2004/06/17 13:26:50  jalet
-# Better exception handling code
-#
-# Revision 1.62  2004/06/16 20:56:34  jalet
-# Smarter initialisation code
-#
-# Revision 1.61  2004/06/08 09:00:04  jalet
-# Fixed problem when username was passed in uppercase from Samba and we
-# tried to find correct line in CUPS page_log to extract the hostname.
-#
-# Revision 1.60  2004/06/03 23:14:08  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.59  2004/06/03 22:12:53  jalet
-# Now denies empty jobs
-#
-# Revision 1.58  2004/06/03 21:50:33  jalet
-# Improved error logging.
-# crashrecipient directive added.
-# Now exports the job's size in bytes too.
-#
-# Revision 1.57  2004/06/02 22:18:07  jalet
-# I think the bug when cancelling jobs should be fixed right now
-#
-# Revision 1.56  2004/06/02 21:50:56  jalet
-# Moved the sigterm capturing elsewhere
-#
-# Revision 1.55  2004/06/02 14:25:07  jalet
-# Should correctly capture ALL errors now
-#
-# Revision 1.54  2004/05/26 16:44:48  jalet
-# Now logs something when client hostname can't be extracted
-#
-# Revision 1.53  2004/05/26 14:49:35  jalet
-# First try at saving the job-originating-hostname in the database
-#
-# Revision 1.52  2004/05/25 09:15:13  jalet
-# accounter.py : old code deleted
-# the rest : now exports PYKOTAPRECOMPUTEDJOBSIZE and PYKOTAPRECOMPUTEDJOBPRICE
-#
-# Revision 1.51  2004/05/25 08:31:16  jalet
-# Heavy CPU usage seems to be fixed at least !
-#
-# Revision 1.50  2004/05/25 05:17:50  jalet
-# Now precomputes the job's size only if current printer's enforcement
-# is "STRICT"
-#
-# Revision 1.49  2004/05/24 22:45:48  jalet
-# New 'enforcement' directive added
-# Polling loop improvements
-#
-# Revision 1.48  2004/05/24 14:36:24  jalet
-# Revert to old polling loop. Will need optimisations
-#
-# Revision 1.47  2004/05/24 11:59:46  jalet
-# More robust (?) code
-#
-# Revision 1.46  2004/05/21 22:02:51  jalet
-# Preliminary work on pre-accounting
-#
-# Revision 1.45  2004/05/19 07:15:32  jalet
-# Could the 'misterious' bug in my loop be finally fixed ???
-#
-# Revision 1.44  2004/05/18 14:48:47  jalet
-# Big code changes to completely remove the need for "requester" directives,
-# jsut use "hardware(... your previous requester directive's content ...)"
-#
-# Revision 1.43  2004/05/17 11:46:05  jalet
-# First try at cupspykota's main loop rewrite
-#
-# Revision 1.42  2004/05/10 11:22:28  jalet
-# Typo
-#
-# Revision 1.41  2004/05/10 10:07:30  jalet
-# Catches OSError while reading
-#
-# Revision 1.40  2004/05/10 09:29:48  jalet
-# Should be more robust if we receive a SIGTERM during an I/O operation
-#
-# Revision 1.39  2004/05/07 14:44:53  jalet
-# Fix for file handles unregistered twice from the polling object
-#
-# Revision 1.38  2004/04/09 22:24:46  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.37  2004/03/18 19:11:25  jalet
-# Fix for raw jobs in cupspykota
-#
-# Revision 1.36  2004/03/18 14:03:18  jalet
-# Added fsync() calls
-#
-# Revision 1.35  2004/03/16 12:05:01  jalet
-# Small fix for new waitprinter.sh : when job was denied, would wait forever
-# for printer being in printing mode.
-#
-# Revision 1.34  2004/03/15 10:47:56  jalet
-# This time the traceback formatting should be correct !
-#
-# Revision 1.33  2004/03/05 12:46:07  jalet
-# Improve tracebacks
-#
-# Revision 1.32  2004/03/05 12:31:35  jalet
-# Now should output full traceback when crashing
-#
-# Revision 1.31  2004/03/01 14:35:56  jalet
-# PYKOTAPHASE wasn't set soon enough at the start of the job
-#
-# Revision 1.30  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.29  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.28  2004/02/26 14:18:07  jalet
-# Should fix the remaining bugs wrt printers groups and users groups.
-#
-# Revision 1.27  2004/02/04 23:41:27  jalet
-# Should fix the incorrect "backend died abnormally" problem.
-#
-# Revision 1.26  2004/01/30 16:35:03  jalet
-# Fixes stupid software accounting bug in CUPS backend
-#
-# Revision 1.25  2004/01/16 17:51:46  jalet
-# Fuck Fuck Fuck !!!
-#
-# Revision 1.24  2004/01/14 15:52:01  jalet
-# Small fix for job cancelling code.
-#
-# Revision 1.23  2004/01/13 10:48:28  jalet
-# Small streams polling loop modification.
-#
-# Revision 1.22  2004/01/12 22:43:40  jalet
-# New formula to compute a job's price
-#
-# Revision 1.21  2004/01/12 18:17:36  jalet
-# Denied jobs weren't stored into the history anymore, this is now fixed.
-#
-# Revision 1.20  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.19  2004/01/08 14:10:32  jalet
-# Copyright year changed.
-#
-# Revision 1.18  2004/01/07 16:16:32  jalet
-# Better debugging information
-#
-# Revision 1.17  2003/12/27 16:49:25  uid67467
-# Should be ok now.
-#
-# Revision 1.17  2003/12/06 08:54:29  jalet
-# Code simplifications.
-# Added many debugging messages.
-#
-# Revision 1.16  2003/11/26 20:43:29  jalet
-# Inadvertantly introduced a bug, which is fixed.
-#
-# Revision 1.15  2003/11/26 19:17:35  jalet
-# Printing on a printer not present in the Quota Storage now results
-# in the job being stopped or cancelled depending on the system.
-#
-# Revision 1.14  2003/11/25 13:25:45  jalet
-# Boolean problem with old Python, replaced with 0
-#
-# Revision 1.13  2003/11/23 19:01:35  jalet
-# Job price added to history
-#
-# Revision 1.12  2003/11/21 14:28:43  jalet
-# More complete job history.
-#
-# Revision 1.11  2003/11/19 23:19:35  jalet
-# Code refactoring work.
-# Explicit redirection to /dev/null has to be set in external policy now, just
-# like in external mailto.
-#
-# Revision 1.10  2003/11/18 17:54:24  jalet
-# SIGTERMs are now transmitted to original backends.
-#
-# Revision 1.9  2003/11/18 14:11:07  jalet
-# Small fix for bizarre urls
-#
-# Revision 1.8  2003/11/15 14:26:44  jalet
-# General improvements to the documentation.
-# Email address changed in sample configuration file, because
-# I receive low quota messages almost every day...
-#
-# Revision 1.7  2003/11/14 22:05:12  jalet
-# New CUPS backend fully functionnal.
-# Old CUPS configuration method is now officially deprecated.
-#
-# Revision 1.6  2003/11/14 20:13:11  jalet
-# We exit the loop too soon.
-#
-# Revision 1.5  2003/11/14 18:31:27  jalet
-# Not perfect, but seems to work with the poll() loop.
-#
-# Revision 1.4  2003/11/14 17:04:15  jalet
-# More (untested) work on the CUPS backend.
-#
-# Revision 1.3  2003/11/12 23:27:44  jalet
-# More work on new backend. This commit may be unstable.
-#
-# Revision 1.2  2003/11/12 09:33:34  jalet
-# New CUPS backend supports device enumeration
-#
-# Revision 1.1  2003/11/08 16:05:31  jalet
-# CUPS backend added for people to experiment.
-#
 #
 #

pykota/trunk/bin/dumpykota

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.22  2005/01/17 08:44:23  jalet
-# Modified copyright years
-#
-# Revision 1.21  2005/01/08 17:03:06  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.
-#
-# Revision 1.20  2005/01/08 11:25:48  jalet
-# Fixed the time zone field in page_log output to make PrintAnalyzer happy
-#
-# Revision 1.19  2005/01/08 10:52:01  jalet
-# Now dumpykota can dump the history into CUPS' page_log format, allowing the
-# use of tools like PrintAnalyzer or phpPrintAnalyzer along with PyKota
-#
-# Revision 1.18  2005/01/07 12:40:53  jalet
-# Fixed field type's name in XML dumps.
-#
-# Revision 1.17  2004/12/21 15:50:00  jalet
-# The dumpykota command now supports extended filtering capabilities with
-# the PostgreSQL backend. LDAP doesn't yet support such possibilities.
-#
-# Revision 1.16  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.15  2004/10/12 15:37:00  jalet
-# Now outputs the name of the offending user if a mere mortal tries to use
-# one of these commands !!!
-#
-# Revision 1.14  2004/10/11 22:53:05  jalet
-# Postponed string interpolation to help message's output method
-#
-# Revision 1.13  2004/10/11 12:49:06  jalet
-# Renders help translatable
-#
-# Revision 1.12  2004/10/07 21:14:28  jalet
-# Hopefully final fix for data encoding to and from the database
-#
-# Revision 1.11  2004/10/07 14:35:40  jalet
-# Now edpykota refuses to launch if the user is not a PyKota administrator.
-# dumpykota : now has the same error message than edpykota in this case.
-#
-# Revision 1.10  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.9  2004/10/05 20:08:46  jalet
-# Misleading help message. Thx to Johannes Laemmermann.
-#
-# Revision 1.8  2004/10/05 09:59:19  jalet
-# Restore compatibility with Python 2.1
-#
-# Revision 1.7  2004/10/04 21:25:29  jalet
-# dumpykota can now output datas in the XML format
-#
-# Revision 1.6  2004/09/15 18:28:41  jalet
-# Updated help for dumpykota
-#
-# Revision 1.5  2004/09/15 07:38:05  jalet
-# Fix for uninitialized variable
-#
-# Revision 1.4  2004/09/15 07:26:19  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.3  2004/09/15 06:58:25  jalet
-# User groups membership and printer groups membership can now be dumped too
-#
-# Revision 1.2  2004/09/14 22:29:12  jalet
-# First version of dumpykota. Works fine but only with PostgreSQL backend
-# for now.
-#
-# Revision 1.1  2004/07/01 19:22:37  jalet
-# First draft of dumpykota
-#
 #
 #

pykota/trunk/bin/edpykota

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.88  2005/02/19 17:47:19  jalet
-# Fixed the --prototype command line option to edpykota
-#
-# Revision 1.87  2005/02/13 22:02:28  jalet
-# Big database structure changes. Upgrade script is now included as well as
-# the new LDAP schema.
-# Introduction of the -o | --overcharge command line option to edpykota.
-# The output of repykota is more complete, but doesn't fit in 80 columns anymore.
-# Introduction of the new 'maxdenybanners' directive.
-#
-# Revision 1.86  2005/01/21 14:40:01  jalet
-# edpykota's --delete command line tool doesn't use "*" as its default argument
-# anymore when the user doesn't pass any real argument :-)
-#
-# Revision 1.85  2005/01/18 19:47:49  jalet
-# Big bug fix wrt the datelimit attribute
-#
-# Revision 1.84  2005/01/17 08:44:23  jalet
-# Modified copyright years
-#
-# Revision 1.83  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.82  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.81  2004/10/12 15:37:00  jalet
-# Now outputs the name of the offending user if a mere mortal tries to use
-# one of these commands !!!
-#
-# Revision 1.80  2004/10/11 22:53:05  jalet
-# Postponed string interpolation to help message's output method
-#
-# Revision 1.79  2004/10/11 12:49:06  jalet
-# Renders help translatable
-#
-# Revision 1.78  2004/10/07 14:35:40  jalet
-# Now edpykota refuses to launch if the user is not a PyKota administrator.
-# dumpykota : now has the same error message than edpykota in this case.
-#
-# Revision 1.77  2004/09/28 17:45:31  jalet
-# Added the --hardreset command line option to edpykota
-#
-# Revision 1.76  2004/07/01 19:56:40  jalet
-# Better dispatching of error messages
-#
-# Revision 1.75  2004/06/18 13:34:47  jalet
-# Now all tracebacks include PyKota's version number
-#
-# Revision 1.74  2004/06/07 18:43:40  jalet
-# Fixed over-verbose exits when displaying help or version number
-#
-# Revision 1.73  2004/06/03 21:50:34  jalet
-# Improved error logging.
-# crashrecipient directive added.
-# Now exports the job's size in bytes too.
-#
-# Revision 1.72  2004/04/16 16:20:19  jalet
-# Note about not implemented limitby values
-#
-# Revision 1.71  2004/03/24 15:15:24  jalet
-# Began integration of Henrik Janhagen's work on quota-then-balance
-# and balance-then-quota
-#
-# Revision 1.70  2004/02/27 09:23:21  jalet
-# Minor code reorganisation
-#
-# Revision 1.69  2004/02/19 15:05:56  jalet
-# domain names changed to example.com in the doc, according to RFC2606
-#
-# Revision 1.68  2004/01/28 10:05:22  jalet
-# New user/group deletion code
-#
-# Revision 1.67  2004/01/15 11:19:07  jalet
-# Typos in messages wrt gettext.
-#
-# Revision 1.66  2004/01/12 21:54:36  jalet
-# User's email address can now be set at user's creation time.
-#
-# Revision 1.65  2004/01/08 16:24:49  jalet
-# edpykota now supports adding printers to printer groups.
-#
-# Revision 1.64  2004/01/08 14:10:32  jalet
-# Copyright year changed.
-#
-# Revision 1.63  2003/11/24 16:50:58  jalet
-# Old help message deletedd
-#
-# Revision 1.62  2003/11/12 23:28:38  jalet
-# More work on new backend. This commit may be unstable.
-#
-# Revision 1.61  2003/11/12 13:06:35  jalet
-# Bug fix wrt no user/group name command line argument to edpykota
-#
-# Revision 1.60  2003/10/09 21:25:24  jalet
-# Multiple printer names or wildcards can be passed on the command line
-# separated with commas.
-# Beta phase.
-#
-# Revision 1.59  2003/10/07 09:07:27  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.58  2003/10/03 12:27:01  jalet
-# Several optimizations, especially with LDAP backend
-#
-# Revision 1.57  2003/08/20 16:01:19  jalet
-# Comment added.
-#
-# Revision 1.56  2003/07/29 20:55:17  jalet
-# 1.14 is out !
-#
-# Revision 1.55  2003/07/28 09:11:12  jalet
-# PyKota now tries to add its attributes intelligently in existing LDAP
-# directories.
-#
-# Revision 1.54  2003/07/21 06:32:42  jalet
-# Prevents email messages to be sent at modification/creation time for
-# a user/group quota
-#
-# Revision 1.53  2003/07/09 06:03:41  jalet
-# Fixed typo when using edpykota --prototype
-#
-# Revision 1.52  2003/07/07 12:11:13  jalet
-# Small fix
-#
-# Revision 1.51  2003/07/07 11:55:50  jalet
-# Small fix
-#
-# Revision 1.50  2003/07/05 12:33:53  jalet
-# More on previous fix.
-#
-# Revision 1.49  2003/07/05 12:32:07  jalet
-# Ensure that the user don't pass more than two prices for a printer.
-#
-# Revision 1.48  2003/06/25 19:52:30  jalet
-# Should be ready for testing :-)
-#
-# Revision 1.47  2003/06/25 14:10:01  jalet
-# Hey, it may work (edpykota --reset excepted) !
-#
-# Revision 1.46  2003/06/16 11:59:09  jalet
-# More work on LDAP
-#
-# Revision 1.45  2003/06/11 19:32:00  jalet
-# Severe bug wrt account balance setting should be corrected.
-#
-# Revision 1.44  2003/04/29 22:03:38  jalet
-# Better error handling.
-#
-# Revision 1.43  2003/04/23 22:13:56  jalet
-# Preliminary support for LPRng added BUT STILL UNTESTED.
-#
-# Revision 1.42  2003/04/17 13:38:47  jalet
-# Docstring corrected for better manual page
-#
-# Revision 1.41  2003/04/16 12:35:49  jalet
-# Groups quota work now !
-#
-# Revision 1.40  2003/04/16 08:22:09  jalet
-# More strict error detection.
-# Minor code rewrite to avoid some repetitive tests.
-#
-# Revision 1.39  2003/04/16 08:01:53  jalet
-# edpykota --charge command line option works now.
-#
-# Revision 1.38  2003/04/15 22:02:43  jalet
-# More complete docstring
-#
-# Revision 1.37  2003/04/15 21:58:33  jalet
-# edpykota now accepts a --delete option.
-# Preparation to allow edpykota to accept much more command line options
-# (WARNING : docstring is OK, but code isn't !)
-#
-# Revision 1.36  2003/04/15 13:55:28  jalet
-# Options --limitby and --balance added to edpykota
-#
-# Revision 1.35  2003/04/15 13:06:39  jalet
-# Allow to add a printer without any user
-#
-# Revision 1.34  2003/04/11 16:51:11  jalet
-# Bug fix for edpykota --add with users who already had a quota on the printer.
-#
-# Revision 1.33  2003/04/10 21:47:20  jalet
-# Job history added. Upgrade script neutralized for now !
-#
-# Revision 1.32  2003/04/08 21:31:39  jalet
-# (anything or 0) = anything !!! Go back to school Jerome !
-#
-# Revision 1.31  2003/04/08 21:13:44  jalet
-# Prepare --groups option to work.
-#
-# Revision 1.30  2003/04/08 21:10:18  jalet
-# Checks --groups option presence instead of --users because --users is the default.
-#
-# Revision 1.29  2003/04/05 09:28:56  jalet
-# Unnecessary message was logged
-#
-# Revision 1.28  2003/03/29 13:45:26  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.27  2003/03/10 00:23:04  jalet
-# Bad english
-#
-# Revision 1.26  2003/03/10 00:11:27  jalet
-# Cleaner example.
-#
-# Revision 1.25  2003/03/09 23:56:21  jalet
-# Option noquota added to do accounting only.
-#
-# 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:37:02  jalet
-# Wildcards seem to work now
-#
-# Revision 1.21  2003/02/27 09:04:46  jalet
-# user and group names can be passed as wildcards if the --add option
-# is not set. The default is to act on all users or groups.
-#
-# Revision 1.20  2003/02/10 12:07:30  jalet
-# Now repykota should output the recorded total page number for each printer too.
-#
-# Revision 1.19  2003/02/09 13:40:29  jalet
-# typo
-#
-# Revision 1.18  2003/02/09 12:56:53  jalet
-# Internationalization begins...
-#
-# Revision 1.17  2003/02/08 22:47:23  jalet
-# Option --reset can now be used without having to use soft and hard limits
-# on the command line.
-#
-# Revision 1.16  2003/02/08 22:39:46  jalet
-# --reset command line option added
-#
-# Revision 1.15  2003/02/08 22:20:01  jalet
-# Clarification on why we don't check with /etc/passwd to see if the user
-# name is valid or not.
-#
-# Revision 1.14  2003/02/08 22:18:15  jalet
-# Now checks user and group names for validity before adding them
-#
-# Revision 1.13  2003/02/08 22:09:02  jalet
-# Only printer was added the first time.
-#
-# Revision 1.12  2003/02/08 21:44:49  jalet
-# Python 2.1 string module doesn't define ascii_letters
-#
-# Revision 1.11  2003/02/08 09:42:44  jalet
-# Better handle wrong or bad command line arguments
-#
-# Revision 1.10  2003/02/08 09:39:20  jalet
-# typos
-#
-# Revision 1.9  2003/02/08 09:38:06  jalet
-# Badly placed test
-#
-# Revision 1.8  2003/02/07 22:53:57  jalet
-# Checks if printer name is valid before adding it
-#
-# Revision 1.7  2003/02/07 22:17:58  jalet
-# Incomplete test
-#
-# Revision 1.6  2003/02/07 22:13:13  jalet
-# Perhaps edpykota is now able to add printers !!! Oh, stupid me !
-#
-# Revision 1.5  2003/02/06 14:49:04  jalet
-# edpykota should be ok now
-#
-# Revision 1.4  2003/02/06 14:28:59  jalet
-# edpykota should be ok, minus some typos
-#
-# Revision 1.3  2003/02/06 10:47:21  jalet
-# Documentation string and command line options didn't match.
-#
-# Revision 1.2  2003/02/06 10:39:23  jalet
-# Preliminary edpykota work.
-#
-# Revision 1.1  2003/02/05 21:41:09  jalet
-# Skeletons added for all command line tools
-#
 #
 #

pykota/trunk/bin/lprngpykota

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.18  2005/03/02 17:00:03  jalet
-# Fixed a bad copy&paste
-#
-# Revision 1.17  2005/02/16 00:29:33  jalet
-# Fixed the maxdenybanners directive.
-# Introduced the denyduplicates directive.
-# Fixed some database related glitches.
-#
-# Revision 1.16  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.15  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.14  2005/02/13 22:48:37  jalet
-# Added the md5sum to the history
-#
-# Revision 1.13  2005/01/17 08:44:23  jalet
-# Modified copyright years
-#
-# Revision 1.12  2004/10/25 17:05:36  jalet
-# Another fix for LPRng support debug messages : I'm sure I'm completely stupid now.
-#
-# Revision 1.11  2004/10/25 15:14:59  jalet
-# Fixed typo in code added to debug LPRng problem
-#
-# Revision 1.10  2004/10/24 09:06:46  jalet
-# Added debug messages for LPRng support possible problem ???
-#
-# Revision 1.9  2004/10/19 21:37:57  jalet
-# Fixes recently introduced bug
-#
-# Revision 1.8  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.7  2004/09/13 16:02:44  jalet
-# Added fix for incorrect job's size when hardware accounting fails
-#
-# Revision 1.6  2004/09/02 14:40:13  jalet
-# Another bunch of LPRng fixes
-#
-# Revision 1.5  2004/07/23 11:19:48  jalet
-# 1.19beta is out !
-#
-# Revision 1.4  2004/07/22 22:41:48  jalet
-# Hardware accounting for LPRng should be OK now. UNTESTED.
-#
-# Revision 1.3  2004/07/21 09:35:48  jalet
-# Software accounting seems to be OK with LPRng support now
-#
-# Revision 1.2  2004/07/20 22:47:38  jalet
-# Sanitizing
-#
-# Revision 1.1  2004/07/17 20:37:27  jalet
-# Missing file... Am I really stupid ?
-#
 #
 #

pykota/trunk/bin/pkbanner

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.12  2005/01/17 08:44:23  jalet
-# Modified copyright years
-#
-# Revision 1.11  2004/12/03 12:34:28  jalet
-# Fixed the default value for the --savetoner command line option
-#
-# Revision 1.10  2004/11/17 13:28:19  jalet
-# Fixed some typo in the help
-#
-# Revision 1.9  2004/11/17 13:24:05  jalet
-# Improved pkbanner's help
-#
-# Revision 1.8  2004/11/17 13:12:04  jalet
-# Implemented the --savetoner command line option
-#
-# Revision 1.7  2004/11/15 22:29:01  jalet
-# Moved title and filename to the left to free some space.
-#
-# Revision 1.6  2004/11/15 22:20:27  jalet
-# Now outputs strings as-is, and not title-ized
-#
-# Revision 1.5  2004/11/15 22:01:34  jalet
-# Improved banner handling.
-# Fix for raw printing and banners.
-#
-# Revision 1.4  2004/11/15 19:59:34  jalet
-# PyKota banners now basically work !
-#
-# Revision 1.3  2004/11/12 23:46:44  jalet
-# Heavy work on pkbanner. Not finished yet though, but mostly works.
-#
-# Revision 1.2  2004/11/11 14:25:48  jalet
-# Added some TODO comments
-#
-# Revision 1.1  2004/11/10 22:48:47  jalet
-# Banner generator's skeleton added
-#
 #
 #

pykota/trunk/bin/pkhint

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.23  2005/02/22 17:18:18  jalet
-# Simplified pkhint's output to take care of the software() accounter
-# optimization and of the internal PJL accounter.
-#
-# Revision 1.22  2005/01/17 08:44:23  jalet
-# Modified copyright years
-#
-# Revision 1.21  2004/10/13 08:26:06  jalet
-# Doesn't suggest hardware(snmp) anymore if the command used was not snmpget.
-# This caused problem when snmpwalk was successful but not snmpget for example
-#
-# Revision 1.20  2004/10/13 08:09:19  jalet
-# More complete PATH.
-# pkhint doesn't use absolute path to search for helper commands anymore.
-#
-# Revision 1.19  2004/10/11 22:53:05  jalet
-# Postponed string interpolation to help message's output method
-#
-# Revision 1.18  2004/10/11 12:49:06  jalet
-# Renders help translatable
-#
-# Revision 1.17  2004/09/23 19:29:36  jalet
-# If SNMP accounting is possible, pkhint now suggests to use the internal
-# SNMP handling instead of the external one. No real test is done for now,
-# though.
-#
-# Revision 1.16  2004/07/27 21:50:29  jalet
-# Small fix for %(port)s thanks to rpinheiro
-#
-# Revision 1.15  2004/07/20 22:19:45  jalet
-# Sanitized a bit + use of gettext
-#
-# Revision 1.14  2004/07/01 19:56:40  jalet
-# Better dispatching of error messages
-#
-# Revision 1.13  2004/06/29 07:55:18  jalet
-# Doesn't output the warning message when --help or --version is asked
-#
-# Revision 1.12  2004/06/29 07:53:11  jalet
-# Improved pkhint
-#
-# Revision 1.11  2004/06/18 13:34:48  jalet
-# Now all tracebacks include PyKota's version number
-#
-# Revision 1.10  2004/06/07 18:43:40  jalet
-# Fixed over-verbose exits when displaying help or version number
-#
-# Revision 1.9  2004/06/03 21:50:34  jalet
-# Improved error logging.
-# crashrecipient directive added.
-# Now exports the job's size in bytes too.
-#
-# Revision 1.8  2004/05/18 14:48:47  jalet
-# Big code changes to completely remove the need for "requester" directives,
-# jsut use "hardware(... your previous requester directive's content ...)"
-#
-# Revision 1.7  2004/05/13 13:59:27  jalet
-# Code simplifications
-#
-# Revision 1.6  2004/03/30 12:59:47  jalet
-# Fixed path problem
-#
-# Revision 1.5  2004/02/09 13:07:06  jalet
-# Should now be able to handle network + pjl printers
-#
-# Revision 1.4  2004/02/09 12:35:19  jalet
-# De-uglyfication.
-# Now works with older CUPS (1.14) which don't detect the cupspykota backend but accept it anyway.
-#
-# Revision 1.3  2004/02/07 13:56:03  jalet
-# Help
-#
-# Revision 1.2  2004/02/07 13:47:55  jalet
-# More warnings
-#
-# Revision 1.1  2004/02/07 13:45:51  jalet
-# Preliminary work on the pkhint command
-#
 #
 #

pykota/trunk/bin/pkmail

@@ -23 +23 @@
 # $Id$
 #
-# $Log$
-# Revision 1.4  2005/02/22 17:36:58  jalet
-# Fixed the command's help
-#
-# Revision 1.3  2005/01/17 08:44:24  jalet
-# Modified copyright years
-#
-# Revision 1.2  2004/11/21 22:16:11  jalet
-# Added some kind of protection against bad guys
-#
-# Revision 1.1  2004/11/21 21:50:03  jalet
-# Introduced the new pkmail command as a simple email gateway
 #
 

pykota/trunk/bin/pkpgcounter

@@ -23 +23 @@
 # $Id$
 #
-# $Log$
-# Revision 1.12  2005/01/17 08:44:24  jalet
-# Modified copyright years
-#
-# Revision 1.11  2004/05/21 20:40:07  jalet
-# All the code for pkpgcounter is now in pdlanalyzer.py
-#
-# Revision 1.10  2004/05/18 09:59:54  jalet
-# pkpgcounter is now just a wrapper around the PDLAnalyzer class
-#
-# Revision 1.9  2004/05/10 07:23:21  jalet
-# pykotme now uses pkpgcounter to compute the job's size.
-#
-# Revision 1.8  2004/05/08 15:12:23  jalet
-# Improved PCL6 support
-#
-# Revision 1.7  2004/05/07 23:08:21  jalet
-# Skeleton for PCLXL aka PCL6
-# Added the "potential" fix for rastertoprinter's output
-#
-# Revision 1.6  2004/05/06 21:19:27  jalet
-# Doesn't exit anymore on the first nul byte
-#
-# Revision 1.5  2004/05/06 12:37:29  jalet
-# pkpgcounter : comments
-# pkprinters : when --add is used, existing printers are now skipped.
-#
-# Revision 1.4  2004/05/04 12:21:55  jalet
-# Now uses mmap in PCL mode
-#
-# Revision 1.3  2004/05/04 04:39:26  jalet
-# Better PCL support
-#
-# Revision 1.2  2004/05/04 03:14:26  jalet
-# fixed copy&paste problem in pkpgcounter
-#
-# Revision 1.1  2004/04/08 17:07:42  jalet
-# pkpgcounter added
-#
 #
 

pykota/trunk/bin/pkprinters

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.19  2005/01/17 08:44:24  jalet
-# Modified copyright years
-#
-# Revision 1.18  2004/10/20 12:32:51  jalet
-# Fixed typo in help
-#
-# Revision 1.17  2004/10/13 21:40:10  jalet
-# Now mandates that the user be a PyKota administrator to allow dangerous
-# command line options. --list is still allowed to mere mortals though.
-#
-# Revision 1.16  2004/10/11 22:53:05  jalet
-# Postponed string interpolation to help message's output method
-#
-# Revision 1.15  2004/10/11 12:49:06  jalet
-# Renders help translatable
-#
-# Revision 1.14  2004/07/19 22:37:13  jalet
-# pykosd is now a very good tool
-#
-# Revision 1.13  2004/07/01 19:56:41  jalet
-# Better dispatching of error messages
-#
-# Revision 1.12  2004/07/01 17:45:47  jalet
-# Added code to handle the description field for printers
-#
-# Revision 1.11  2004/06/18 13:34:48  jalet
-# Now all tracebacks include PyKota's version number
-#
-# Revision 1.10  2004/06/07 18:43:40  jalet
-# Fixed over-verbose exits when displaying help or version number
-#
-# Revision 1.9  2004/06/03 21:50:34  jalet
-# Improved error logging.
-# crashrecipient directive added.
-# Now exports the job's size in bytes too.
-#
-# Revision 1.8  2004/05/06 20:30:24  jalet
-# Added --skipexisting command line option to pkprinters
-#
-# Revision 1.7  2004/05/06 12:51:58  jalet
-# Documentation
-#
-# Revision 1.6  2004/05/06 12:37:29  jalet
-# pkpgcounter : comments
-# pkprinters : when --add is used, existing printers are now skipped.
-#
-# Revision 1.5  2004/04/16 16:52:09  jalet
-# Better formatting
-#
-# Revision 1.4  2004/04/16 16:47:57  jalet
-# pkprinters now accept the --list command line option
-#
-# Revision 1.3  2004/02/04 13:24:41  jalet
-# pkprinters can now remove printers from printers groups.
-#
-# Revision 1.2  2004/02/04 12:52:37  jalet
-# pkprinters' help
-#
-# Revision 1.1  2004/02/04 11:16:59  jalet
-# pkprinters command line tool added.
-#
 #
 #

pykota/trunk/bin/pykosd

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.12  2005/01/17 08:44:24  jalet
-# Modified copyright years
-#
-# Revision 1.11  2004/10/17 19:41:54  jalet
-# Fixed help message which displayed "pkprinters" instead of "pykosd"
-#
-# Revision 1.10  2004/10/11 22:53:05  jalet
-# Postponed string interpolation to help message's output method
-#
-# Revision 1.9  2004/10/11 12:49:06  jalet
-# Renders help translatable
-#
-# Revision 1.8  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.7  2004/07/20 22:42:26  jalet
-# pykosd now supports setting color
-#
-# Revision 1.6  2004/07/20 22:29:49  jalet
-# pykosd now supports setting the font
-#
-# Revision 1.5  2004/07/20 22:19:45  jalet
-# Sanitized a bit + use of gettext
-#
-# Revision 1.4  2004/07/19 22:37:13  jalet
-# pykosd is now a very good tool
-#
-# Revision 1.3  2004/07/07 21:44:15  jalet
-# Formatting improvements
-#
-# Revision 1.2  2004/07/07 14:14:31  jalet
-# Now handles limits by quota in addition to limits by balance
-#
-# Revision 1.1  2004/07/07 13:21:27  jalet
-# Introduction of the pykosd command
-#
 #
 #

pykota/trunk/bin/pykotme

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.18  2005/01/17 08:44:24  jalet
-# Modified copyright years
-#
-# Revision 1.17  2004/11/12 23:46:44  jalet
-# Heavy work on pkbanner. Not finished yet though, but mostly works.
-#
-# Revision 1.16  2004/10/11 22:53:05  jalet
-# Postponed string interpolation to help message's output method
-#
-# Revision 1.15  2004/10/11 12:49:06  jalet
-# Renders help translatable
-#
-# Revision 1.14  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.13  2004/07/01 19:56:42  jalet
-# Better dispatching of error messages
-#
-# Revision 1.12  2004/06/18 13:34:49  jalet
-# Now all tracebacks include PyKota's version number
-#
-# Revision 1.11  2004/06/07 18:43:40  jalet
-# Fixed over-verbose exits when displaying help or version number
-#
-# Revision 1.10  2004/06/03 21:50:34  jalet
-# Improved error logging.
-# crashrecipient directive added.
-# Now exports the job's size in bytes too.
-#
-# Revision 1.9  2004/05/21 20:53:34  jalet
-# Now pykotme doesn't spawn a new process anymore to compute job's size, but
-# use the PDLAnalyzer class directly
-#
-# Revision 1.8  2004/05/10 07:23:21  jalet
-# pykotme now uses pkpgcounter to compute the job's size.
-#
-# Revision 1.7  2004/01/12 22:43:40  jalet
-# New formula to compute a job's price
-#
-# Revision 1.6  2004/01/08 14:10:32  jalet
-# Copyright year changed.
-#
-# Revision 1.5  2003/10/09 21:25:25  jalet
-# Multiple printer names or wildcards can be passed on the command line
-# separated with commas.
-# Beta phase.
-#
-# Revision 1.4  2003/10/07 09:07:27  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.3  2003/07/29 20:55:17  jalet
-# 1.14 is out !
-#
-# Revision 1.2  2003/07/25 10:41:29  jalet
-# Better documentation.
-# pykotme now displays the current user's account balance.
-# Some test changed in ldap module.
-#
-# Revision 1.1  2003/07/03 09:44:01  jalet
-# Now includes the pykotme utility
-#
 #
 #

pykota/trunk/bin/repykota

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.53  2005/01/17 08:44:24  jalet
-# Modified copyright years
-#
-# Revision 1.52  2004/10/11 22:53:05  jalet
-# Postponed string interpolation to help message's output method
-#
-# Revision 1.51  2004/10/11 12:49:06  jalet
-# Renders help translatable
-#
-# Revision 1.50  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.49  2004/06/18 13:34:49  jalet
-# Now all tracebacks include PyKota's version number
-#
-# Revision 1.48  2004/06/07 18:43:41  jalet
-# Fixed over-verbose exits when displaying help or version number
-#
-# Revision 1.47  2004/06/03 21:50:34  jalet
-# Improved error logging.
-# crashrecipient directive added.
-# Now exports the job's size in bytes too.
-#
-# Revision 1.46  2004/01/08 14:10:32  jalet
-# Copyright year changed.
-#
-# Revision 1.45  2003/10/09 21:25:25  jalet
-# Multiple printer names or wildcards can be passed on the command line
-# separated with commas.
-# Beta phase.
-#
-# Revision 1.44  2003/10/07 09:07:27  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.43  2003/08/18 16:35:28  jalet
-# New pychecker pass, on the tools this time.
-#
-# Revision 1.42  2003/07/29 20:55:17  jalet
-# 1.14 is out !
-#
-# Revision 1.41  2003/07/07 12:19:52  jalet
-# Now repykota and warnpykota --groups check the groups the user is a member of
-# in the print quota database, not in the system passwd/group files
-#
-# Revision 1.40  2003/06/30 12:46:15  jalet
-# Extracted reporting code.
-#
-# Revision 1.39  2003/06/25 14:10:01  jalet
-# Hey, it may work (edpykota --reset excepted) !
-#
-# Revision 1.38  2003/06/15 22:26:52  jalet
-# More work on LDAP
-#
-# Revision 1.37  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.36  2003/06/06 14:21:08  jalet
-# New LDAP schema.
-# Small bug fixes.
-#
-# Revision 1.35  2003/05/28 13:56:24  jalet
-# Unneeded code.
-#
-# Revision 1.34  2003/04/29 22:03:38  jalet
-# Better error handling.
-#
-# Revision 1.33  2003/04/28 08:25:48  jalet
-# Small display bug in repykota was fixed.
-#
-# Revision 1.32  2003/04/23 22:13:56  jalet
-# Preliminary support for LPRng added BUT STILL UNTESTED.
-#
-# Revision 1.31  2003/04/23 09:58:17  jalet
-# Prices per page/job are now displayed
-#
-# Revision 1.30  2003/04/18 08:34:51  jalet
-# Minor fix.
-#
-# Revision 1.29  2003/04/18 08:29:30  jalet
-# Minor bug fix
-#
-# Revision 1.28  2003/04/17 09:36:30  jalet
-# Bad alignment in output
-#
-# Revision 1.27  2003/04/17 09:26:21  jalet
-# repykota now reports account balances too.
-#
-# Revision 1.26  2003/04/16 12:35:49  jalet
-# Groups quota work now !
-#
-# Revision 1.25  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.24  2003/04/14 20:05:20  jalet
-# Reversed test.
-#
-# Revision 1.23  2003/04/11 14:42:54  jalet
-# Translations
-#
-# Revision 1.21  2003/04/10 21:47:20  jalet
-# Job history added. Upgrade script neutralized for now !
-#
-# Revision 1.20  2003/04/08 21:31:39  jalet
-# (anything or 0) = anything !!! Go back to school Jerome !
-#
-# Revision 1.19  2003/04/08 21:13:44  jalet
-# Prepare --groups option to work.
-#
-# Revision 1.18  2003/04/08 21:10:18  jalet
-# Checks --groups option presence instead of --users because --users is the default.
-#
-# Revision 1.17  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.16  2003/03/09 23:56:21  jalet
-# Option noquota added to do accounting only.
-#
-# Revision 1.15  2003/03/09 23:39:14  jalet
-# Simplified translations.
-#
-# Revision 1.14  2003/02/27 09:04:02  jalet
-# Missing translation
-#
-# Revision 1.13  2003/02/27 08:44:01  jalet
-# Check to see if the printer was ever used at all, and displays "unknown"
-# as the pagecounter value in this casCheck to see if the printer was ever used at all, and displays "unknown"
-# as the pagecounter value in this case.
-#
-# Revision 1.12  2003/02/17 23:02:23  jalet
-# getGraceDelay for printer
-#
-# Revision 1.11  2003/02/10 12:12:34  jalet
-# Translations.
-#
-# Revision 1.10  2003/02/10 12:07:30  jalet
-# Now repykota should output the recorded total page number for each printer too.
-#
-# Revision 1.9  2003/02/09 13:40:29  jalet
-# typo
-#
-# Revision 1.8  2003/02/09 12:56:53  jalet
-# Internationalization begins...
-#
-# Revision 1.7  2003/02/08 23:17:20  jalet
-# repykota now outputs life time page counters and the total pages printed by
-# all users/groups on each printer.
-#
-# Revision 1.6  2003/02/07 23:39:16  jalet
-# Typos
-#
-# Revision 1.5  2003/02/07 08:38:36  jalet
-# Missing conversion.
-# empty line between two printers
-#
-# Revision 1.4  2003/02/07 08:34:15  jalet
-# Test wrt date limit was wrong
-#
-# Revision 1.3  2003/02/07 00:08:52  jalet
-# Typos
-#
-# Revision 1.2  2003/02/06 23:58:05  jalet
-# repykota should be ok
-#
 #
 #

pykota/trunk/bin/warnpykota

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.37  2005/01/17 08:44:24  jalet
-# Modified copyright years
-#
-# Revision 1.36  2004/10/12 17:08:32  jalet
-# alreadydone mapping was reset in each iteration, this is fixed.
-#
-# Revision 1.35  2004/10/12 09:14:03  jalet
-# Ensures that warnpykota still test other quota entries for each user if
-# he has not been warned, even if limited by his account balance.
-#
-# Revision 1.34  2004/10/12 09:09:04  jalet
-# Now warnpykota warns users limited by balance only once per launch.
-#
-# Revision 1.33  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.32  2004/10/11 22:53:05  jalet
-# Postponed string interpolation to help message's output method
-#
-# Revision 1.31  2004/10/11 12:49:06  jalet
-# Renders help translatable
-#
-# Revision 1.30  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.29  2004/06/18 13:34:49  jalet
-# Now all tracebacks include PyKota's version number
-#
-# Revision 1.28  2004/06/07 18:43:41  jalet
-# Fixed over-verbose exits when displaying help or version number
-#
-# Revision 1.27  2004/06/03 21:50:34  jalet
-# Improved error logging.
-# crashrecipient directive added.
-# Now exports the job's size in bytes too.
-#
-# Revision 1.26  2004/01/08 14:10:32  jalet
-# Copyright year changed.
-#
-# Revision 1.25  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.24  2003/10/07 09:07:28  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.23  2003/08/18 16:35:28  jalet
-# New pychecker pass, on the tools this time.
-#
-# Revision 1.22  2003/07/29 20:55:17  jalet
-# 1.14 is out !
-#
-# Revision 1.21  2003/07/07 12:19:52  jalet
-# Now repykota and warnpykota --groups check the groups the user is a member of
-# in the print quota database, not in the system passwd/group files
-#
-# Revision 1.20  2003/06/25 14:10:01  jalet
-# Hey, it may work (edpykota --reset excepted) !
-#
-# Revision 1.19  2003/04/29 22:03:38  jalet
-# Better error handling.
-#
-# Revision 1.18  2003/04/23 22:13:56  jalet
-# Preliminary support for LPRng added BUT STILL UNTESTED.
-#
-# Revision 1.17  2003/04/17 13:32:17  jalet
-# bad documentation string
-#
-# Revision 1.16  2003/04/16 12:35:49  jalet
-# Groups quota work now !
-#
-# Revision 1.15  2003/04/10 21:47:20  jalet
-# Job history added. Upgrade script neutralized for now !
-#
-# Revision 1.14  2003/04/08 21:31:39  jalet
-# (anything or 0) = anything !!! Go back to school Jerome !
-#
-# Revision 1.13  2003/04/08 21:13:44  jalet
-# Prepare --groups option to work.
-#
-# Revision 1.12  2003/04/08 21:10:18  jalet
-# Checks --groups option presence instead of --users because --users is the default.
-#
-# Revision 1.11  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.10  2003/03/25 11:45:32  jalet
-# Clearer help.
-#
-# Revision 1.9  2003/03/09 23:39:14  jalet
-# Simplified translations.
-#
-# Revision 1.8  2003/02/10 12:07:30  jalet
-# Now repykota should output the recorded total page number for each printer too.
-#
-# Revision 1.7  2003/02/09 13:40:29  jalet
-# typo
-#
-# Revision 1.6  2003/02/09 12:56:53  jalet
-# Internationalization begins...
-#
-# Revision 1.5  2003/02/07 23:24:38  jalet
-# Empty line deleted
-#
-# Revision 1.4  2003/02/06 23:25:40  jalet
-# Cleaner docstring
-#
-# Revision 1.3  2003/02/06 23:20:02  jalet
-# warnpykota doesn't need any user/group name argument, mimicing the
-# warnquota disk quota tool.
-#
-# Revision 1.2  2003/02/06 22:54:33  jalet
-# warnpykota should be ok
-#
 #
 #

pykota/trunk/cgi-bin/dumpykota.cgi

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.5  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.4  2005/01/17 08:44:24  jalet
-# Modified copyright years
-#
-# Revision 1.3  2005/01/10 14:57:29  jalet
-# Fixed the default datatype which is now set to 'history'
-#
-# Revision 1.2  2005/01/08 19:47:00  jalet
-# Fixed a bad copy&paste
-#
-# Revision 1.1  2005/01/08 19:13:11  jalet
-# dumpykota.cgi was added to allow the use of dumpykota through the web.
-# This makes real time interfacing with the third party software phpPrintAnalyzer
-# a breeze !
 #
 #

pykota/trunk/cgi-bin/printquota.cgi

@@ -23 +23 @@
 # $Id$
 #
-# $Log$
-# Revision 1.45  2005/02/13 22:22:03  jalet
-# Added missing fields
-#
-# Revision 1.44  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.43  2005/01/17 08:44:24  jalet
-# Modified copyright years
-#
-# Revision 1.42  2005/01/08 17:19:02  jalet
-# Fixed incorrect import statement
-#
-# Revision 1.41  2005/01/08 17:13:08  jalet
-# Move some functions outside of the CGI to allow their use in other CGI scripts
-#
-# Revision 1.40  2004/10/23 19:28:18  jalet
-# Small fix to the cgi script to please Freshmeat's fmII URL validator/1.1
-#
-# Revision 1.39  2004/10/13 09:38:25  jalet
-# Added a translatable message from the CGI script
-#
-# Revision 1.38  2004/10/02 13:47:46  jalet
-# The CGI script doesn't depend anymore on what is in the submit button
-# to display the print quota report.
-#
-# Revision 1.37  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.36  2004/09/02 10:34:09  jalet
-# Fixed problem with mod_auth_ldap Apache module
-#
-# Revision 1.35  2004/07/24 20:10:10  jalet
-# Incorrect number of parameters in error method
-#
-# Revision 1.34  2004/07/24 20:07:13  jalet
-# Added special Python comment to remove warning at runtime
-#
-# Revision 1.33  2004/07/21 19:24:48  jalet
-# Inversion
-#
-# Revision 1.32  2004/07/21 19:20:05  jalet
-# Missing translation in CGI script
-#
-# Revision 1.31  2004/07/21 13:32:02  jalet
-# All messages should be translatable now.
-#
-# Revision 1.30  2004/07/01 17:45:48  jalet
-# Added code to handle the description field for printers
-#
-# Revision 1.29  2004/06/06 21:07:55  jalet
-# Improved CGI script to allow history on printers and hostnames.
-# Better (?) colors in stylesheet.
-#
-# Revision 1.28  2004/06/05 22:42:41  jalet
-# Improved web history reports
-#
-# Revision 1.27  2004/05/26 14:49:40  jalet
-# First try at saving the job-originating-hostname in the database
-#
-# Revision 1.26  2004/03/24 19:37:04  jalet
-# Doesn't retrieve users or printers objects to display the history,
-# this is not needed, and saves a lot of time (and database queries
-# if storagecahing is disabled)
-#
-# Revision 1.25  2004/01/12 15:28:45  jalet
-# Now can output the user's history on several printers at the same time.
-#
-# Revision 1.24  2004/01/12 14:52:03  jalet
-# Cuts the date string
-#
-# Revision 1.23  2004/01/12 14:35:01  jalet
-# Printing history added to CGI script.
-#
-# Revision 1.22  2004/01/09 07:58:53  jalet
-# Changed URL to PyKota's logo
-#
-# Revision 1.21  2004/01/08 14:10:32  jalet
-# Copyright year changed.
-#
-# Revision 1.20  2004/01/07 16:07:17  jalet
-# The stylesheet is again expected to be local, it was a bad idea to use
-# the one on my server.
-#
-# Revision 1.19  2004/01/06 16:05:45  jalet
-# Will now search the stylesheet on my own website.
-#
-# Revision 1.18  2003/12/27 16:49:25  uid67467
-# Should be ok now.
-#
-# Revision 1.16  2003/12/02 14:40:20  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.15  2003/10/24 22:06:42  jalet
-# Initial support for browser's language preference added.
-#
-# Revision 1.14  2003/10/10 19:48:07  jalet
-# Now displays version number
-#
-# Revision 1.13  2003/08/25 11:23:05  jalet
-# More powerful CGI script for quota reports
-#
-# Revision 1.12  2003/07/29 20:55:17  jalet
-# 1.14 is out !
-#
-# Revision 1.11  2003/07/01 12:37:31  jalet
-# Nicer UI
-#
-# Revision 1.10  2003/07/01 07:30:32  jalet
-# Message changed.
-#
-# Revision 1.9  2003/06/30 13:47:26  jalet
-# Allows multiple user / group names masks in the input field
-#
-# Revision 1.8  2003/06/30 13:32:01  jalet
-# Much more powerful CGI script for quota reports
-#
-# Revision 1.7  2003/06/30 12:46:15  jalet
-# Extracted reporting code.
-#
-# Revision 1.6  2003/04/23 22:13:56  jalet
-# Preliminary support for LPRng added BUT STILL UNTESTED.
-#
-# Revision 1.5  2003/04/17 21:30:09  jalet
-# Now includes the logo
-#
-# Revision 1.4  2003/04/08 21:20:25  jalet
-# CGI Script now displays a link to PyKota's website.
-#
-# Revision 1.3  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.2  2003/02/12 11:31:51  jalet
-# doesn't use the jaxml module anymore
-#
-# Revision 1.1  2003/02/10 13:41:38  jalet
-# repykota cgi script added.
-# cleaner doc.
 #
 

pykota/trunk/checkdeps.py

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.6  2005/03/05 18:54:54  jalet
-# Improved the installation documentation.
-# Now checkdeps also checks for the presence of GhostScript, which
-# may be needed if PyKota's bannering facility is used or if some
-# printer driver produces non-DSC compliant PostScript.
-#
-# Revision 1.5  2005/02/14 23:37:58  jalet
-# Added a check for the presence of pythn-psyco
-#
-# Revision 1.4  2005/01/17 08:44:23  jalet
-# Modified copyright years
-#
-# Revision 1.3  2004/11/15 21:11:01  jalet
-# Modified some labels for Python modules
-#
-# Revision 1.2  2004/11/15 21:08:01  jalet
-# Now checks for the presence of ReportLab and PIL
-#
-# Revision 1.1  2004/11/10 22:17:12  jalet
-# Installation script is now non-interactive again, and doesn't install
-# the sample configuration files into /etc/pykota anymore.
-# Dependencies check is now done by running checkdeps.py
-# The database creation scripts will now be included in RPM packages.
-#
 #
 #

pykota/trunk/contributed/pagecount.pl

@@ -32 +32 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.3  2005/01/17 08:44:24  jalet
-# Modified copyright years
-#
-# Revision 1.2  2004/01/08 14:10:32  jalet
-# Copyright year changed.
-#
-# Revision 1.1  2003/12/27 16:57:42  uid67467
-# Added Perl script which does PJL accounting, contributed by Ren�und Jensen
-#
-# Revision 1.1  2003/12/06 09:03:43  jalet
-# Added Perl script to retrieve printer's internal page counter via PJL,
-# contributed by Ren�und Jensen.
-#
 #
 #

pykota/trunk/docs/autopykota.sgml

@@ -47 +47 @@
 </chapter>
 
-<!--
-
-$Log$
-Revision 1.2  2005/02/28 00:07:37  jalet
-Added pkmail's doc.
-Used the <command> tag instead of <application> for commands.
-Fixed some typos.
-Added some missing command line options in the commands reference.
-
-Revision 1.1  2004/10/06 10:03:16  jalet
-Improved documentation
-
--->

pykota/trunk/docs/dumpykota.sgml

@@ -99 +99 @@
 </chapter>
 
-<!--
-
-$Log$
-Revision 1.3  2005/02/28 00:07:37  jalet
-Added pkmail's doc.
-Used the <command> tag instead of <application> for commands.
-Fixed some typos.
-Added some missing command line options in the commands reference.
-
-Revision 1.2  2004/10/06 10:03:16  jalet
-Improved documentation
-
-Revision 1.1  2004/09/27 08:19:14  jalet
-Wrote some doc for dumpykota
-
--->

pykota/trunk/docs/filterpykota.sgml

@@ -83 +83 @@
 </chapter>
 
-<!--
-
-$Log$
-Revision 1.12  2004/07/16 12:22:45  jalet
-LPRng support early version
-
-Revision 1.11  2004/05/25 09:49:52  jalet
-The old pykota filter has been removed. LPRng support disabled for now.
-
-Revision 1.10  2004/05/13 13:59:28  jalet
-Code simplifications
-
-Revision 1.9  2004/03/03 19:35:36  jalet
-Spelling problem. Thanks to Jurandy Martins
-
-Revision 1.8  2003/11/15 14:59:53  jalet
-Documentation wrt the new CUPS backend.
-
-Revision 1.7  2003/10/14 20:26:53  jalet
-Better documentation.
-1.15 is out !
-
-Revision 1.6  2003/07/25 13:10:58  jalet
-Improved documentation
-
-Revision 1.5  2003/07/25 10:41:29  jalet
-Better documentation.
-pykotme now displays the current user's account balance.
-Some test changed in ldap module.
-
-Revision 1.4  2003/04/30 20:00:51  jalet
-Typo
-
-Revision 1.3  2003/04/24 21:09:47  jalet
-Documentation slightly improved.
-
-Revision 1.2  2003/03/25 09:32:06  jalet
-Improved documentation.
-
-Revision 1.1  2003/02/08 00:03:35  jalet
-Documentation skeleton added
-
-
--->

pykota/trunk/docs/installation.sgml

@@ -846 +846 @@
 </chapter>
 
-<!--
-
-$Log$
-Revision 1.33  2005/03/05 18:54:54  jalet
-Improved the installation documentation.
-Now checkdeps also checks for the presence of GhostScript, which
-may be needed if PyKota's bannering facility is used or if some
-printer driver produces non-DSC compliant PostScript.
-
-Revision 1.32  2005/02/28 23:17:40  jalet
-Improved documentation
-
-Revision 1.31  2005/02/28 22:29:25  jalet
-More complete PostgreSQL configuration.
-Changed all occurences of /etc/pykota/ to ~pykota/
-
-Revision 1.30  2005/02/28 00:07:37  jalet
-Added pkmail's doc.
-Used the <command> tag instead of <application> for commands.
-Fixed some typos.
-Added some missing command line options in the commands reference.
-
-Revision 1.29  2004/11/10 22:35:23  jalet
-Changes to the installation documentation
-
-Revision 1.28  2004/10/06 10:03:16  jalet
-Improved documentation
-
-Revision 1.27  2004/07/21 09:39:03  jalet
-LPRng documentation
-
-Revision 1.26  2004/07/16 12:22:46  jalet
-LPRng support early version
-
-Revision 1.25  2004/05/25 09:49:53  jalet
-The old pykota filter has been removed. LPRng support disabled for now.
-
-Revision 1.24  2004/02/13 08:46:32  jalet
-Fixed documentation wrt installation paths changed
-
-Revision 1.23  2004/01/30 17:13:56  jalet
-1.17
-
-Revision 1.22  2003/11/15 14:59:53  jalet
-Documentation wrt the new CUPS backend.
-
-Revision 1.21  2003/10/14 20:26:53  jalet
-Better documentation.
-1.15 is out !
-
-Revision 1.20  2003/07/25 13:20:32  jalet
-Typo which wasn't
-
-Revision 1.19  2003/07/25 13:18:44  jalet
-Typos
-
-Revision 1.18  2003/07/25 10:41:29  jalet
-Better documentation.
-pykotme now displays the current user's account balance.
-Some test changed in ldap module.
-
-Revision 1.17  2003/06/30 21:44:18  jalet
-1.09 is out !
-
-Revision 1.16  2003/06/24 21:37:05  jalet
-Minor changes
-
-Revision 1.15  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.14  2003/06/05 07:12:29  jalet
-Reorganization of directories
-
-Revision 1.13  2003/04/24 21:09:47  jalet
-Documentation slightly improved.
-
-Revision 1.12  2003/04/17 21:33:16  jalet
-Version 1.03 is out.
-
-Revision 1.11  2003/03/25 09:32:06  jalet
-Improved documentation.
-
-Revision 1.10  2003/03/23 17:59:56  jalet
-Clarify a point.
-
-Revision 1.9  2003/03/23 17:57:20  jalet
-Deleted a repetition.
-
-Revision 1.8  2003/03/22 15:34:50  jalet
-More complete installation documentation.
-
-Revision 1.7  2003/03/22 14:26:45  jalet
-Download instructions added.
-
-Revision 1.6  2003/03/22 14:06:02  jalet
-Quota Storage Server installation is OK for PostgreSQL.
-
-Revision 1.5  2003/03/22 13:11:33  jalet
-The port on which the Quota Storage Sever is listening can now
-be set in the configuration file (see sample).
-Better error handling if PygreSQL is not installed.
-Improved documentation.
-Version number changed to 1.02alpha
-
-Revision 1.4  2003/03/22 07:20:38  jalet
-More information wrt PostgreSQL tcp/ip configuration.
-
-Revision 1.3  2003/03/18 22:18:25  jalet
-The documentation will only be a sequence of chapters in a single part, not
-multiple parts each including chapters.
-
-Revision 1.2  2003/03/18 22:10:54  jalet
-Documentation improvements.
-
-Revision 1.1  2003/02/08 00:03:35  jalet
-Documentation skeleton added
-
-
--->

pykota/trunk/docs/pkhint.sgml

@@ -49 +49 @@
 </chapter>
 
-<!--
-
-$Log$
-Revision 1.2  2005/02/28 22:29:25  jalet
-More complete PostgreSQL configuration.
-Changed all occurences of /etc/pykota/ to ~pykota/
-
-Revision 1.1  2004/03/18 10:32:23  jalet
-Added pkhint's documentation
-
--->

pykota/trunk/docs/pkmail.sgml

@@ -100 +100 @@
 </chapter>
 
-<!--
-
-$Log$
-Revision 1.1  2005/02/28 00:07:37  jalet
-Added pkmail's doc.
-Used the <command> tag instead of <application> for commands.
-Fixed some typos.
-Added some missing command line options in the commands reference.
-
-
--->

pykota/trunk/docs/pkprinters.sgml

@@ -41 +41 @@
 </chapter>
 
-<!--
-
-$Log$
-Revision 1.2  2005/02/28 00:07:37  jalet
-Added pkmail's doc.
-Used the <command> tag instead of <application> for commands.
-Fixed some typos.
-Added some missing command line options in the commands reference.
-
-Revision 1.1  2004/03/16 14:42:31  jalet
-Improved documentation
-
-
--->

pykota/trunk/docs/pykosd.sgml

@@ -54 +54 @@
 </chapter>
 
-<!--
-
-$Log$
-Revision 1.2  2004/07/19 22:37:13  jalet
-pykosd is now a very good tool
-
-Revision 1.1  2004/07/16 12:22:46  jalet
-LPRng support early version
-
--->

pykota/trunk/docs/pykota.sgml

@@ -138 +138 @@
 </book>
 
-<!--
-
-$Log$
-Revision 1.17  2005/02/28 00:07:37  jalet
-Added pkmail's doc.
-Used the <command> tag instead of <application> for commands.
-Fixed some typos.
-Added some missing command line options in the commands reference.
-
-Revision 1.16  2005/01/17 08:44:24  jalet
-Modified copyright years
-
-Revision 1.15  2004/10/06 10:03:16  jalet
-Improved documentation
-
-Revision 1.14  2004/09/27 08:19:14  jalet
-Wrote some doc for dumpykota
-
-Revision 1.13  2004/07/16 12:22:46  jalet
-LPRng support early version
-
-Revision 1.12  2004/03/18 10:32:23  jalet
-Added pkhint's documentation
-
-Revision 1.11  2004/03/16 14:42:31  jalet
-Improved documentation
-
-Revision 1.10  2004/01/12 23:16:42  jalet
-Copyright year.
-
-Revision 1.9  2003/11/18 08:39:49  jalet
-Documentation's licensed changed from GNU FDL to GNU GPL, to please Debian.
-
-Revision 1.8  2003/08/18 19:20:19  jalet
-I don't know what I did, but I know this was incorrect !
-Documentation compiles again.
-
-Revision 1.7  2003/07/29 09:54:03  jalet
-Added configurable LDAP mail attribute support
-
-Revision 1.6  2003/07/25 13:10:58  jalet
-Improved documentation
-
-Revision 1.5  2003/07/25 10:41:29  jalet
-Better documentation.
-pykotme now displays the current user's account balance.
-Some test changed in ldap module.
-
-Revision 1.4  2003/03/25 09:32:06  jalet
-Improved documentation.
-
-Revision 1.3  2003/03/18 22:18:25  jalet
-The documentation will only be a sequence of chapters in a single part, not
-multiple parts each including chapters.
-
-Revision 1.2  2003/02/08 00:13:49  jalet
-What is the tag for the zip code ?
-
-Revision 1.1  2003/02/08 00:03:35  jalet
-Documentation skeleton added
-
-
--->

pykota/trunk/docs/pykotme.sgml

@@ -88 +88 @@
 </chapter>
 
-<!--
-
-$Log$
-Revision 1.6  2005/02/28 00:07:37  jalet
-Added pkmail's doc.
-Used the <command> tag instead of <application> for commands.
-Fixed some typos.
-Added some missing command line options in the commands reference.
-
-Revision 1.5  2003/10/12 20:47:51  jalet
-Doc enhanced.
-
-Revision 1.4  2003/07/25 13:18:44  jalet
-Typos
-
-Revision 1.3  2003/07/25 13:16:44  jalet
-Typo
-
-Revision 1.2  2003/07/25 13:10:58  jalet
-Improved documentation
-
-Revision 1.1  2003/07/25 10:41:30  jalet
-Better documentation.
-pykotme now displays the current user's account balance.
-Some test changed in ldap module.
-
-
--->

pykota/trunk/docs/repykota.sgml

@@ -149 +149 @@
 </chapter>
 
-<!--
-
-$Log$
-Revision 1.10  2005/02/28 22:29:25  jalet
-More complete PostgreSQL configuration.
-Changed all occurences of /etc/pykota/ to ~pykota/
-
-Revision 1.9  2005/02/28 00:07:37  jalet
-Added pkmail's doc.
-Used the <command> tag instead of <application> for commands.
-Fixed some typos.
-Added some missing command line options in the commands reference.
-
-Revision 1.8  2004/10/06 10:03:16  jalet
-Improved documentation
-
-Revision 1.7  2004/01/12 23:10:35  jalet
-PyKota 1.16beta1 is finally out.
-
-Revision 1.6  2003/10/12 20:47:51  jalet
-Doc enhanced.
-
-Revision 1.5  2003/07/25 13:10:58  jalet
-Improved documentation
-
-Revision 1.4  2003/04/24 21:09:47  jalet
-Documentation slightly improved.
-
-Revision 1.3  2003/03/25 09:32:06  jalet
-Improved documentation.
-
-Revision 1.2  2003/03/08 22:22:40  jalet
-First bit of documentation
-
-Revision 1.1  2003/02/08 00:03:35  jalet
-Documentation skeleton added
-
-
--->

pykota/trunk/docs/scripts.sgml

@@ -116 +116 @@
 </chapter>
 
-<!--
-
-$Log$
-Revision 1.2  2004/05/18 14:48:48  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/03/16 14:42:31  jalet
-Improved documentation
-
-
--->

pykota/trunk/docs/warnpykota.sgml

@@ -73 +73 @@
 </chapter>
 
-<!--
-
-$Log$
-Revision 1.7  2005/02/28 00:07:37  jalet
-Added pkmail's doc.
-Used the <command> tag instead of <application> for commands.
-Fixed some typos.
-Added some missing command line options in the commands reference.
-
-Revision 1.6  2004/10/06 10:03:16  jalet
-Improved documentation
-
-Revision 1.5  2003/07/25 13:10:58  jalet
-Improved documentation
-
-Revision 1.4  2003/04/24 21:09:47  jalet
-Documentation slightly improved.
-
-Revision 1.3  2003/03/25 12:30:37  jalet
-Added warnpykota command synopsis
-
-Revision 1.2  2003/03/25 09:32:06  jalet
-Improved documentation.
-
-Revision 1.1  2003/02/08 00:03:35  jalet
-Documentation skeleton added
-
--->

pykota/trunk/initscripts/mysql/pykota-mysql.sql

@@ -18 +18 @@
 --
 -- $Id$
---
--- $Log$
--- Revision 1.2  2005/01/17 08:44:24  jalet
--- Modified copyright years
---
--- Revision 1.1  2004/06/20 19:14:20  jalet
--- Added first draft of MySQL initialization script
---
 --
 --

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

@@ -18 +18 @@
 --
 -- $Id$
---
--- $Log$
--- Revision 1.16  2005/02/13 22:02:29  jalet
--- Big database structure changes. Upgrade script is now included as well as
--- the new LDAP schema.
--- Introduction of the -o | --overcharge command line option to edpykota.
--- The output of repykota is more complete, but doesn't fit in 80 columns anymore.
--- Introduction of the new 'maxdenybanners' directive.
---
--- Revision 1.15  2005/01/23 10:58:22  jalet
--- Added a few indexes for the database
---
--- Revision 1.14  2005/01/17 08:44:24  jalet
--- Modified copyright years
---
--- Revision 1.13  2005/01/10 23:23:25  jalet
--- Added the billing code to the history
---
--- Revision 1.12  2004/12/23 18:40:18  jalet
--- Added the coefficient table, and many columns to existing tables
---
--- Revision 1.11  2004/06/20 16:15:21  jalet
--- Added "description" attribute for printers
---
--- Revision 1.10  2004/06/03 23:14:09  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.9  2004/05/13 11:15:29  jalet
--- Added hostname field in job history
---
--- Revision 1.8  2004/01/08 14:10:32  jalet
--- Copyright year changed.
---
--- Revision 1.7  2003/12/27 16:49:25  uid67467
--- Should be ok now.
---
--- Revision 1.6  2003/11/23 19:01:36  jalet
--- Job price added to history
---
--- Revision 1.5  2003/11/21 14:28:45  jalet
--- More complete job history.
---
--- Revision 1.4  2003/07/16 21:53:07  jalet
--- Really big modifications wrt new configuration file's location and content.
---
--- Revision 1.3  2003/07/09 20:17:07  jalet
--- Email field added to PostgreSQL schema
---
--- Revision 1.2  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.1  2003/06/05 07:12:31  jalet
--- Reorganization of directories
---
 --
 --

pykota/trunk/initscripts/postgresql/upgrade-to-1.14.sql

@@ -19 +19 @@
 -- $Id$
 --
--- $Log$
--- Revision 1.3  2004/01/08 14:10:32  jalet
--- Copyright year changed.
---
--- Revision 1.2  2003/07/16 21:53:07  jalet
--- Really big modifications wrt new configuration file's location and content.
---
--- Revision 1.1  2003/07/09 20:17:07  jalet
--- Email field added to PostgreSQL schema
---
---
---
--- This script has to be used if you already
--- have a pre-1.14 version of PyKota to upgrade
--- your database schema. 
---
--- YOU DON'T NEED TO USE IT IF YOU'VE JUST INSTALLED PYKOTA
 --
                         

pykota/trunk/initscripts/postgresql/upgrade-to-1.16.sql

@@ -18 +18 @@
 --
 -- $Id$
---
--- $Log$
--- Revision 1.4  2004/01/08 14:10:32  jalet
--- Copyright year changed.
---
--- Revision 1.3  2003/12/27 16:49:25  uid67467
--- Should be ok now.
---
--- Revision 1.2  2003/11/23 19:01:36  jalet
--- Job price added to history
---
--- Revision 1.1  2003/11/21 14:29:14  jalet
--- Forgot to add this file...
 --
 --

pykota/trunk/initscripts/postgresql/upgrade-to-1.19.sql

@@ -18 +18 @@
 --
 -- $Id$
---
--- $Log$
--- Revision 1.3  2004/06/20 16:15:21  jalet
--- Added "description" attribute for printers
---
--- Revision 1.2  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.1  2004/05/13 11:15:29  jalet
--- Added hostname field in job history
 --
 --

pykota/trunk/initscripts/postgresql/upgrade-to-1.21.sql

@@ -18 +18 @@
 --
 -- $Id$
---
--- $Log$
--- Revision 1.1  2005/02/13 22:15:43  jalet
--- Missing upgrade script
 --
 --

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

@@ -18 +18 @@
 --
 -- $Id$
---
--- $Log$
--- Revision 1.2  2004/01/08 14:10:32  jalet
--- Copyright year changed.
---
--- Revision 1.1  2003/06/05 07:12:31  jalet
--- Reorganization of directories
---
 --
 --

pykota/trunk/pykota/accounter.py

@@ -20 +20 @@
 #
 # $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)
-#
 #
 #

pykota/trunk/pykota/accounters/hardware.py

@@ -20 +20 @@
 #
 # $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
-#
 #
 #

pykota/trunk/pykota/accounters/software.py

@@ -20 +20 @@
 #
 # $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
 #
 #

pykota/trunk/pykota/cgifuncs.py

@@ -18 +18 @@
 # $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
-#
 #
 

pykota/trunk/pykota/config.py

@@ -20 +20 @@
 #
 # $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
-#
 #
 #

pykota/trunk/pykota/dumper.py

@@ -19 +19 @@
 #
 # $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.
-#
 #
 #

pykota/trunk/pykota/ipp.py

@@ -20 +20 @@
 #
 # $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...
 #
 #

pykota/trunk/pykota/logger.py

@@ -21 +21 @@
 # $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
-#
-#
 #
 

pykota/trunk/pykota/loggers/stderr.py

@@ -21 +21 @@
 # $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
-#
-#
 #
 

pykota/trunk/pykota/loggers/system.py

@@ -20 +20 @@
 #
 # $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
-#
 #
 #

pykota/trunk/pykota/pdlanalyzer.py

@@ -20 +20 @@
 #
 # $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
-#
 #
 #

pykota/trunk/pykota/reporter.py

@@ -20 +20 @@
 #
 # $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.
-#
 #
 #

pykota/trunk/pykota/reporters/html.py

@@ -20 +20 @@
 #
 # $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 :-)
-#
 #
 #

pykota/trunk/pykota/reporters/text.py

@@ -20 +20 @@
 #
 # $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.
-#
 #
 #

pykota/trunk/pykota/storage.py

@@ -20 +20 @@
 #
 # $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
-#
 #
 #

pykota/trunk/pykota/storages/dbistorage.py

@@ -20 +20 @@
 #
 # $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
-#
 #
 #

pykota/trunk/pykota/storages/ldapstorage.py

@@ -20 +20 @@
 #
 # $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.
-#
 #
 #

pykota/trunk/pykota/storages/pgstorage.py

@@ -20 +20 @@
 #
 # $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.
-#
-#
 #
 #

pykota/trunk/pykota/storages/sql.py

@@ -20 +20 @@
 #
 # $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
-#
 #
 #

pykota/trunk/pykota/tool.py

@@ -20 +20 @@
 #
 # $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
-#
 #
 #

pykota/trunk/setup.py

@@ -22 +22 @@
 #
 # $Id$
-#
-# $Log$
-# Revision 1.62  2005/01/17 08:44:23  jalet
-# Modified copyright years
-#
-# Revision 1.61  2005/01/08 19:13:11  jalet
-# dumpykota.cgi was added to allow the use of dumpykota through the web.
-# This makes real time interfacing with the third party software phpPrintAnalyzer
-# a breeze !
-#
-# Revision 1.60  2004/11/21 21:50:02  jalet
-# Introduced the new pkmail command as a simple email gateway
-#
-# Revision 1.59  2004/11/15 19:59:34  jalet
-# PyKota banners now basically work !
-#
-# Revision 1.58  2004/11/12 23:46:43  jalet
-# Heavy work on pkbanner. Not finished yet though, but mostly works.
-#
-# Revision 1.57  2004/11/10 22:40:45  jalet
-# Logos are installed now
-#
-# Revision 1.56  2004/11/10 22:17:12  jalet
-# Installation script is now non-interactive again, and doesn't install
-# the sample configuration files into /etc/pykota anymore.
-# Dependencies check is now done by running checkdeps.py
-# The database creation scripts will now be included in RPM packages.
-#
-# Revision 1.55  2004/10/16 10:20:32  jalet
-# Now installs translated manual pages
-#
-# Revision 1.54  2004/10/13 07:45:01  jalet
-# Modified installation script to please both me and the Debian packagers
-#
-# Revision 1.53  2004/10/04 21:25:29  jalet
-# dumpykota can now output datas in the XML format
-#
-# Revision 1.52  2004/09/30 09:52:45  jalet
-# Initial release of autopykota. Reading help or manpage is greatly
-# encouraged !
-#
-# Revision 1.51  2004/09/21 21:31:35  jalet
-# Installation script now checks for availability of Python-SNMP (http://pysnmp.sf.net)
-#
-# Revision 1.50  2004/09/14 22:29:12  jalet
-# First version of dumpykota. Works fine but only with PostgreSQL backend
-# for now.
-#
-# Revision 1.49  2004/07/28 13:00:02  jalet
-# Now takes care of .sxi and .sxc files if any
-#
-# Revision 1.48  2004/07/27 07:14:24  jalet
-# Now warns the user if pyosd is not present
-#
-# Revision 1.47  2004/07/16 12:22:45  jalet
-# LPRng support early version
-#
-# Revision 1.46  2004/07/07 13:21:26  jalet
-# Introduction of the pykosd command
-#
-# Revision 1.45  2004/07/06 09:37:01  jalet
-# Integrated most of the Debian packaging work made by Sergio Gonz�z Gonz�z
-#
-# Revision 1.44  2004/06/05 22:03:49  jalet
-# Payments history is now stored in database
-#
-# Revision 1.43  2004/05/25 09:49:41  jalet
-# The old pykota filter has been removed. LPRng support disabled for now.
-#
-# Revision 1.42  2004/05/18 14:48:46  jalet
-# Big code changes to completely remove the need for "requester" directives,
-# jsut use "hardware(... your previous requester directive's content ...)"
-#
-# Revision 1.41  2004/05/13 14:17:32  jalet
-# Warning about changed accounter and requester directives
-#
-# Revision 1.40  2004/05/13 13:59:27  jalet
-# Code simplifications
-#
-# Revision 1.39  2004/04/08 17:07:41  jalet
-# pkpgcounter added
-#
-# Revision 1.38  2004/03/18 09:18:09  jalet
-# Installation now checks for old scripts
-#
-# Revision 1.37  2004/03/03 19:35:36  jalet
-# Spelling problem. Thanks to Jurandy Martins
-#
-# Revision 1.36  2004/02/25 15:10:38  jalet
-# Preliminary snmpprinterstatus command added.
-#
-# Revision 1.35  2004/02/12 22:43:58  jalet
-# Better integration in Debian and more LSB compliance, thanks to
-# Peter Hawkins.
-#
-# Revision 1.34  2004/02/07 13:45:51  jalet
-# Preliminary work on the pkhint command
-#
-# Revision 1.33  2004/02/04 11:16:59  jalet
-# pkprinters command line tool added.
-#
-# Revision 1.32  2004/01/18 20:52:50  jalet
-# Portuguese portuguese translation replaces brasilian portuguese one, which
-# moves in its own directory.
-# Installation script modified to reorganise installed documentation and include
-# the documentation on OpenOffice.org + ODBC
-#
-# Revision 1.31  2004/01/15 12:50:41  jalet
-# Installation scripts now tells where the documentation was installed.
-#
-# Revision 1.30  2004/01/12 15:45:03  jalet
-# Now installs documentation in /usr/share/doc/pykota too.
-#
-# Revision 1.29  2004/01/08 14:10:32  jalet
-# Copyright year changed.
-#
-# Revision 1.28  2003/12/27 16:49:25  uid67467
-# Should be ok now.
-#
-# Revision 1.28  2003/12/06 09:03:43  jalet
-# Added Perl script to retrieve printer's internal page counter via PJL,
-# contributed by Ren�und Jensen.
-#
-# Revision 1.27  2003/11/28 08:31:28  jalet
-# Shell script to wait for AppleTalk enabled printers being idle was added.
-#
-# Revision 1.26  2003/11/08 16:05:31  jalet
-# CUPS backend added for people to experiment.
-#
-# Revision 1.25  2003/10/08 07:01:19  jalet
-# Job history can be disabled.
-# Some typos in README.
-# More messages in setup script.
-#
-# Revision 1.24  2003/10/07 09:07:27  jalet
-# Character encoding added to please latest version of Python
-#
-# Revision 1.23  2003/07/29 20:55:17  jalet
-# 1.14 is out !
-#
-# 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/23 16:51:32  jalet
-# waitprinter.sh is now included to prevent PyKota from asking the
-# printer's internal page counter while a job is still being printer.
-#
-# 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/03 09:44:00  jalet
-# Now includes the pykotme utility
-#
-# Revision 1.17  2003/06/30 12:46:15  jalet
-# Extracted reporting code.
-#
-# Revision 1.16  2003/06/06 20:49:15  jalet
-# Very latest schema. UNTESTED.
-#
-# Revision 1.15  2003/05/17 16:32:30  jalet
-# Also outputs the original import error message.
-#
-# Revision 1.14  2003/05/17 16:31:38  jalet
-# Dies gracefully if DistUtils is not present.
-#
-# Revision 1.13  2003/04/29 18:37:54  jalet
-# Pluggable accounting methods (actually doesn't support external scripts)
-#
-# Revision 1.12  2003/04/23 22:13:56  jalet
-# Preliminary support for LPRng added BUT STILL UNTESTED.
-#
-# Revision 1.11  2003/04/17 13:49:29  jalet
-# Typo
-#
-# Revision 1.10  2003/04/17 13:48:39  jalet
-# Better help
-#
-# Revision 1.9  2003/04/17 13:47:28  jalet
-# Help added during installation.
-#
-# Revision 1.8  2003/04/15 17:49:29  jalet
-# Installation script now checks the presence of Netatalk
-#
-# Revision 1.7  2003/04/03 20:03:37  jalet
-# Installation script now allows to install the sample configuration file.
-#
-# Revision 1.6  2003/03/29 13:45:26  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.5  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.4  2003/03/29 09:47:00  jalet
-# More powerful installation script.
-#
-# Revision 1.3  2003/03/26 17:48:36  jalet
-# First shot at trying to detect the availability of the needed software
-# during the installation.
-#
-# Revision 1.2  2003/03/09 16:49:04  jalet
-# The installation script installs the man pages too now.
-#
-# Revision 1.1  2003/02/05 21:28:17  jalet
-# Initial import into CVS
-#
 #
 #