Changeset 1755

Timestamp:

09/28/04 19:45:31 (20 years ago)

Author:

jalet

Message:

Added the --hardreset command line option to edpykota

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (6 diffs)
• docs/edpykota.sgml (modified) (3 diffs)
• man/edpykota.1 (modified) (3 diffs)
• NEWS (modified) (1 diff)
• pykota/storage.py (modified) (2 diffs)
• TODO (modified) (1 diff)

pykota/trunk/bin/edpykota

@@ -24 +24 @@
 #
 # $Log$
+# 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
@@ -334 +337 @@
   -n | --noquota       Doesn't set a quota but only does accounting.
   
-  -r | --reset         Resets the printed page counter for the user
-                       or group to zero. The life time page counter 
-                       is kept unchanged.
+  -r | --reset         Resets the actual page counter for the user
+                       or group to zero on the specified printers. 
+                       The life time page counter is kept unchanged.
+                       
+  -R | --hardreset     Resets the actual and life time page counters
+                       for the user or group to zero on the specified 
+                       printers. 
                        
   -l | --limitby l     Choose if the user/group is limited in printing                     
@@ -394 +401 @@
   well as every user whose name begins with 'jo'.
   Their life time page counter on each printer will be kept unchanged.
+  You can also reset the life time page counters by using the
+  --hardreset | -R command line option.
   
   $ edpykota --printer hpcolor --noquota jerome
@@ -622 +631 @@
                         if options["reset"] :
                             entrypquota.reset()
+                        elif options["hardreset"] :    
+                            entrypquota.hardreset()
                             
                         if balance :
@@ -660 +671 @@
                      "printer" : "*", \
                    }
-        short_options = "vhdc:l:b:i:naugrp:P:S:H:G:"
-        long_options = ["help", "version", "charge=", "delete", "limitby=", "balance=", "ingroups=", "noquota", "add", "users", "groups", "reset", "prototype=", "printer=", "softlimit=", "hardlimit=", "pgroups="]
+        short_options = "vhdc:l:b:i:naugrp:P:S:H:G:R"
+        long_options = ["help", "version", "charge=", "delete", "limitby=", "balance=", "ingroups=", "noquota", "add", "users", "groups", "reset", "hardreset", "prototype=", "printer=", "softlimit=", "hardlimit=", "pgroups="]
         
         # Initializes the command line tool
@@ -687 +698 @@
         options["charge"] = options["c"] or options["charge"]
         options["pgroups"] = options["G"] or options["pgroups"]
+        options["hardreset"] = options["R"] or options["hardreset"] 
         
         if options["help"] :

pykota/trunk/docs/edpykota.sgml

@@ -16 +16 @@
       <listitem>
         <para>
-          Add printers ;
+          Add printers (it's preferable to use the <application>pkprinters</application> command for this though) ;
         </para>
       </listitem>
@@ -52 +52 @@
       <listitem>
         <para>
-          Choose the way you will limit printing : either by page quota or by account balance value.
+          Choose the way you will limit printing : either by page quota or by account balance value ;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Reset page counters.
         </para>
       </listitem>
@@ -63 +68 @@
 
 $Log$
+Revision 1.5  2004/09/28 17:45:31  jalet
+Added the --hardreset command line option to edpykota
+
 Revision 1.4  2003/10/14 20:26:53  jalet
 Better documentation.

pykota/trunk/man/edpykota.1

@@ -2 +2 @@
 .TH EDPYKOTA "1" "September 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-edpykota \- manual page for edpykota 1.20alpha12_unofficial
+edpykota \- manual page for edpykota 1.20alpha17_unofficial
 .SH DESCRIPTION
-edpykota v1.20alpha12_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
+edpykota v1.20alpha17_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
 A Print Quota editor for PyKota.
 .PP
@@ -73 +73 @@
 .TP
 \fB\-r\fR | \fB\-\-reset\fR
-Resets the printed page counter for the user
-or group to zero. The life time page counter
-is kept unchanged.
+Resets the actual page counter for the user
+or group to zero on the specified printers.
+The life time page counter is kept unchanged.
+.TP
+\fB\-R\fR | \fB\-\-hardreset\fR
+Resets the actual and life time page counters
+for the user or group to zero on the specified
+printers.
 .TP
 \fB\-l\fR | \fB\-\-limitby\fR l
@@ -137 +142 @@
 well as every user whose name begins with 'jo'.
 Their life time page counter on each printer will be kept unchanged.
+You can also reset the life time page counters by using the
+\fB\-\-hardreset\fR | \fB\-R\fR command line option.
 .IP
 \f(CW$ edpykota --printer hpcolor --noquota jerome\fR

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.20alpha17 :
     
+        - Added --hardreset command line option to edpykota.
+        
         - Fixed problem with accented chars in title, filename
           or options and LDAP backend.

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# 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
@@ -430 +433 @@
         self.parent.writeUserPQuotaPagesCounters(self, 0, int(self.LifePageCounter or 0))
         self.PageCounter = 0
+        
+    def hardreset(self) :    
+        """Resets actual and life time page counters to 0."""
+        self.parent.writeUserPQuotaPagesCounters(self, 0, 0)
+        self.PageCounter = self.LifePageCounter = 0
         
     def computeJobPrice(self, jobsize) :    

pykota/trunk/TODO

@@ -25 +25 @@
           history, to be able to discover duplicate print
           jobs.
-          
-        - Add --hardreset command line option to
-          edpykota to also reset lifetime page counters to 0.
           
         - Maybe put "gracedelay" in the database.