Changeset 791 for pykota/trunk/bin

Timestamp:

02/10/03 13:07:31 (22 years ago)

Author:

jalet

Message:

Now repykota should output the recorded total page number for each printer too.

Location:

pykota/trunk/bin

Files:

• edpykota (modified) (3 diffs)
• repykota (modified) (3 diffs)
• warnpykota (modified) (2 diffs)

pykota/trunk/bin/edpykota

@@ -17 +17 @@
 #
 # $Log$
+# 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
@@ -177 +180 @@
                 if self.isValidName(pname) :
                     self.storage.addPrinter(pname)
-                    printernames = [ pname ]
+                    printernames = [ (pname, 0) ]
                 else :    
                     raise PyKotaToolError, _("Invalid printer name %s") % pname
@@ -197 +200 @@
             self.logger.log_message(_("Hard limit %i is less than soft limit %i, values will be exchanged.") % (hardlimit, softlimit), "warn")
             (softlimit, hardlimit) = (hardlimit, softlimit)
-        for printer in printernames :
+        for (printer, printerpagecounter) in printernames :
             if options["prototype"] :
                 if options["users"] :

pykota/trunk/bin/repykota

@@ -17 +17 @@
 #
 # $Log$
+# 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
@@ -109 +112 @@
         if not printernames :
             raise PyKotaToolError, _("There's no printer matching %s") % options["printer"]
-        for printer in printernames :
+        for (printer, printerpagecounter) in printernames :
             print _("*** Report for %s quota on printer %s") % ((options["users"] and "user") or "group", printer)
             print _("Pages grace time: %idays") % self.config.getGraceDelay()
@@ -127 +130 @@
             if total :        
                 print (" " * 43) + ("Total : %9i" % total)
+            print (" " * 44) + ("Real : %9i" % printerpagecounter)
             print        
                         

pykota/trunk/bin/warnpykota

@@ -17 +17 @@
 #
 # $Log$
+# 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
@@ -107 +110 @@
         if not printernames :
             raise PyKotaToolError, _("There's no printer matching %s") % options["printer"]
-        for printer in printernames :
+        for (printer, printerpagecounter) in printernames :
             if options["users"] :
                 for name in self.storage.getPrinterUsers(printer) :