Changeset 3036 for pykota/trunk/pykota

Timestamp:

10/13/06 23:51:14 (18 years ago)

Author:

jerome

Message:

Charging for ink usage, finally !

Location:

pykota/trunk/pykota

Files:

• accounter.py (modified) (1 diff)
• accounters/ink.py (modified) (2 diffs)
• storage.py (modified) (2 diffs)
• version.py (modified) (1 diff)

pykota/trunk/pykota/accounter.py

@@ -45 +45 @@
         self.isSoftware = 1 # by default software accounting
         self.isPreAccounter = ispreaccounter 
+        self.inkUsage = []
         
     def getLastPageCounter(self) :    

pykota/trunk/pykota/accounters/ink.py

@@ -42 +42 @@
             # know the result.
             self.filter.logdebug("Precomputing pass told us that job is %s pages long." % self.filter.softwareJobSize)
-            return self.filter.softwareJobSize   # Optimize : already computed !
+            self.inkUsage = self.filter.preaccounter.inkUsage   # Optimize : already computed !
+            return self.filter.softwareJobSize                  # Optimize : already computed !
             
-        (colorspace, resolution) = [p.strip() for p in self.arguments.split(',')]
+        parameters = [p.strip() for p in self.arguments.split(',')]
+        if len(parameters) == 1 :
+            parameters.append("72")
+        (colorspace, resolution) = parameters
         colorspace = colorspace.lower()
         if colorspace not in ("cmyk", "bw", "cmy", "rgb") :
@@ -57 +61 @@
         
         jobsize = 0
-        self.inkUsage = []
         if self.filter.JobSizeBytes :
             try :

pykota/trunk/pykota/storage.py

@@ -308 +308 @@
         self.isDirty = True
         
-    def computeJobPrice(self, jobsize) :    
+    def computeJobPrice(self, jobsize, inkusage=[]) :    
         """Computes the job price as the sum of all parent printers' prices + current printer's ones."""
         totalprice = 0.0    
@@ -314 +314 @@
             if self.User.OverCharge != 0.0 :    # optimization, but TODO : beware of rounding errors
                 for upq in [ self ] + self.ParentPrintersUserPQuota :
-                    price = (float(upq.Printer.PricePerPage or 0.0) * jobsize) + float(upq.Printer.PricePerJob or 0.0)
-                    totalprice += price
+                    totalprice += float(upq.Printer.PricePerJob or 0.0)
+                    pageprice = float(upq.Printer.PricePerPage or 0.0)
+                    if not inkusage :
+                        totalprice += (jobsize * pageprice)
+                    else :    
+                        for pageindex in range(jobsize) :
+                            try :
+                                usage = inkusage[pageindex]
+                            except IndexError :    
+                                self.parent.tool.logdebug("No ink usage information. Using base cost of %f credits for page %i." % (pageprice, pageindex+1))
+                                totalprice += pageprice
+                            else :    
+                                coefficients = self.Printer.Coefficients
+                                for (ink, value) in usage.items() :
+                                    coefvalue = coefficients.get(ink, 1.0)
+                                    coefprice = (coefvalue * pageprice) / 100.0
+                                    inkprice = coefprice * value
+                                    self.parent.tool.logdebug("Applying coefficient %f for color %s (used at %f%% on page %i) to base cost %f gives %f" % (coefvalue, ink, value, pageindex+1, pageprice, inkprice))
+                                    totalprice += coefprice
         if self.User.OverCharge != 1.0 : # TODO : beware of rounding errors
             overcharged = totalprice * self.User.OverCharge        
-            self.parent.tool.logdebug("Overcharging %s by a factor of %s ===> User %s will be charged for %s units." % (totalprice, self.User.OverCharge, self.User.Name, overcharged))
+            self.parent.tool.logdebug("Overcharging %s by a factor of %s ===> User %s will be charged for %s credits." % (totalprice, self.User.OverCharge, self.User.Name, overcharged))
             return overcharged
         else :    
             return totalprice
             
-    def increasePagesUsage(self, jobsize) :
+    def increasePagesUsage(self, jobsize, inkusage=[]) :
         """Increase the value of used pages and money."""
-        jobprice = self.computeJobPrice(jobsize)
+        jobprice = self.computeJobPrice(jobsize, inkusage)
         if jobsize :
             if jobprice :

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.25alpha13_unofficial"
+__version__ = "1.25alpha14_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."