Changeset 887 for pykota/trunk/bin

Timestamp:

04/08/03 22:38:08 (21 years ago)

Author:

jalet

Message:

The last job Id is saved now for each printer, this will probably
allow other accounting methods in the future.

Files:

• pykota/trunk/bin/pykota (modified) (4 diffs)

pykota/trunk/bin/pykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.16  2003/04/08 20:38:08  jalet
+# The last job Id is saved now for each printer, this will probably
+# allow other accounting methods in the future.
+#
 # Revision 1.15  2003/03/29 13:45:27  jalet
 # GPL paragraphs were incorrectly (from memory) copied into the sources.
@@ -131 +135 @@
         
     #    
+    # According to CUPS documentation, the job id is the second command line argument
+    jobid = sys.argv[1].strip()
+    
+    #    
     # According to CUPS documentation, the username is the third command line argument
     username = sys.argv[2].strip()    
@@ -155 +163 @@
     else :    
         # get last values from Quota Storage
-        (lastpagecounter, lastusername) = (pgc["pagecounter"], pgc["lastusername"])
+        (lastpagecounter, lastjobid, lastusername) = (pgc["pagecounter"], pgc["lastjobid"], pgc["lastusername"])
         
         # if printer is off then we assume the correct counter value is the last one
@@ -163 +171 @@
         # Update the last page counter and last username in the Quota Storage backend
         # set them to current user and 
-        kotafilter.storage.updatePrinterPageCounter(kotafilter.printername, username, counterbeforejob)
+        kotafilter.storage.updatePrinterPageCounter(kotafilter.printername, username, counterbeforejob, jobid)
         
         # Was the printer ever used ?