Changeset 3029

Timestamp:

10/07/06 11:41:13 (18 years ago)

Author:

jerome

Message:

Make the configuration file parser recognize the 'bw', 'cmyk', 'cmy', and 'rgb'
preaccounter and accounter directives.

Files:

• pykota/trunk/pykota/config.py (modified) (2 diffs)

pykota/trunk/pykota/config.py

@@ -192 +192 @@
     def getPreAccounterBackend(self, printername) :    
         """Returns the preaccounter backend to use for a given printer."""
-        validaccounters = [ "software" ]     
+        validaccounters = [ "software", "bw", "cmyk", "cmy", "rgb" ]     
         try :
             fullaccounter = self.getPrinterOption(printername, "preaccounter").strip()
@@ -199 +199 @@
         else :    
             flower = fullaccounter.lower()
-            if flower.startswith("software") :    
-                try :
-                    (accounter, args) = [x.strip() for x in fullaccounter.split('(', 1)]
-                except ValueError :    
-                    raise PyKotaConfigError, _("Invalid preaccounter %s for printer %s") % (fullaccounter, printername)
-                if args.endswith(')') :
-                    args = args[:-1].strip()
-                return ("software", args)
-            else :
-                raise PyKotaConfigError, _("Option preaccounter in section %s only supports values in %s") % (printername, str(validaccounters))
+            for vac in validaccounters :
+                if flower.startswith(vac) :    
+                    try :
+                        (accounter, args) = [x.strip() for x in fullaccounter.split('(', 1)]
+                    except ValueError :    
+                        raise PyKotaConfigError, _("Invalid preaccounter %s for printer %s") % (fullaccounter, printername)
+                    if args.endswith(')') :
+                        args = args[:-1].strip()
+                    return (vac, args)
+            raise PyKotaConfigError, _("Option preaccounter in section %s only supports values in %s") % (printername, str(validaccounters))
         
     def getAccounterBackend(self, printername) :    
         """Returns the accounter backend to use for a given printer."""
-        validaccounters = [ "hardware", "software" ]     
-        fullaccounter = self.getPrinterOption(printername, "accounter").strip()
-        flower = fullaccounter.lower()
-        if flower.startswith("software") or flower.startswith("hardware") :    
-            try :
-                (accounter, args) = [x.strip() for x in fullaccounter.split('(', 1)]
-            except ValueError :    
-                raise PyKotaConfigError, _("Invalid accounter %s for printer %s") % (fullaccounter, printername)
-            if args.endswith(')') :
-                args = args[:-1].strip()
-            if (accounter == "hardware") and not args :
-                raise PyKotaConfigError, _("Invalid accounter %s for printer %s") % (fullaccounter, printername)
-            return (accounter.lower(), args)
-        else :
+        validaccounters = [ "hardware", "software", "bw", "cmyk", "cmy", "rgb" ]     
+        try :
+            fullaccounter = self.getPrinterOption(printername, "accounter").strip()
+        except PyKotaConfigError :    
+            return ("software", "")
+        else :    
+            flower = fullaccounter.lower()
+            for vac in validaccounters :
+                if flower.startswith(vac) :    
+                    try :
+                        (accounter, args) = [x.strip() for x in fullaccounter.split('(', 1)]
+                    except ValueError :    
+                        raise PyKotaConfigError, _("Invalid accounter %s for printer %s") % (fullaccounter, printername)
+                    if args.endswith(')') :
+                        args = args[:-1].strip()
+                    if (accounter == "hardware") and not args :
+                        raise PyKotaConfigError, _("Invalid accounter %s for printer %s") % (fullaccounter, printername)
+                    return (vac, args)
             raise PyKotaConfigError, _("Option accounter in section %s only supports values in %s") % (printername, str(validaccounters))