Changeset 3034

Timestamp:

10/12/06 23:21:48 (18 years ago)

Author:

jerome

Message:

Can now compute ink usage, but does not use it yet to compute price.

Location:

pykota/trunk/pykota

Files:

• accounters/ink.py (added)
• config.py (modified) (4 diffs)

pykota/trunk/pykota/config.py

@@ -192 +192 @@
     def getPreAccounterBackend(self, printername) :    
         """Returns the preaccounter backend to use for a given printer."""
-        validaccounters = [ "software", "bw", "cmyk", "cmy", "rgb" ]     
+        validaccounters = [ "software", "ink" ]     
         try :
             fullaccounter = self.getPrinterOption(printername, "preaccounter").strip()
@@ -207 +207 @@
                     if args.endswith(')') :
                         args = args[:-1].strip()
+                    if (vac == "ink") and not args :    
+                        raise PyKotaConfigError, _("Invalid preaccounter %s for printer %s") % (fullaccounter, printername)
                     return (vac, args)
             raise PyKotaConfigError, _("Option preaccounter in section %s only supports values in %s") % (printername, str(validaccounters))
@@ -212 +214 @@
     def getAccounterBackend(self, printername) :    
         """Returns the accounter backend to use for a given printer."""
-        validaccounters = [ "hardware", "software", "bw", "cmyk", "cmy", "rgb" ]     
+        validaccounters = [ "hardware", "software", "ink" ]     
         try :
             fullaccounter = self.getPrinterOption(printername, "accounter").strip()
@@ -227 +229 @@
                     if args.endswith(')') :
                         args = args[:-1].strip()
-                    if (accounter == "hardware") and not args :
+                    if (vac in ("hardware", "ink")) and not args :
                         raise PyKotaConfigError, _("Invalid accounter %s for printer %s") % (fullaccounter, printername)
                     return (vac, args)