Changeset 1272

Timestamp:

01/12/04 00:43:31 (21 years ago)

Author:

jalet

Message:

Bug wrt number of copies with CUPS should be fixed.

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/accounter.py (modified) (4 diffs)

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.16alpha24 :
     
+        - Bug wrt number of copies should be fixed.
+        
         - Major code refactoring => It is now possible to
           automatically add printers on first print.

pykota/trunk/pykota/accounter.py

@@ -22 +22 @@
 #
 # $Log$
+# 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
@@ -86 +89 @@
         # computes job's size
         self.JobSize = self.computeJobSize()
+        if ((self.filter.printingsystem == "CUPS") \
+            and (self.filter.preserveinputfile is not None)) \
+            or (self.filter.printingsystem != "CUPS") :
+                self.JobSize *= self.filter.copies
         
         # get last job information for this printer
@@ -109 +116 @@
         
     def doAccounting(self, userpquota) :
-        """Delegates the computation of the job size to an external command.
-        
-           The command must print the job size on its standard output and exit successfully.
-        """
+        """Does accounting for current job."""
         self.beginJob(userpquota)
-        
-        # get the job size, which is real job size * number of copies.
-        # TODO : Double check with CUPS documentation : this is not always correct
-        jobsize = self.getJobSize() * self.filter.copies
             
         # Is the current user allowed to print at all ?
@@ -126 +126 @@
             jobsize = 0
         else :    
+            # get the job size
+            jobsize = self.getJobSize()
             userpquota.increasePagesUsage(jobsize)