Changeset 980 for pykota/trunk/pykota/config.py

Timestamp:

04/30/03 21:53:58 (21 years ago)

Author:

jalet

Message:

1.05

Files:

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

pykota/trunk/pykota/config.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.26  2003/04/30 19:53:58  jalet
+# 1.05
+#
 # Revision 1.25  2003/04/30 13:36:40  jalet
 # Stupid accounting method was added.
@@ -200 +203 @@
            for its internal lifetime page counter.
         """   
-        validaccounters = [ "querying", "stupid" ]     
-        try :
-            accounter = self.getPrinterOption(printer, "accounter").lower()
-        except PyKotaConfigError :    
-            accounter = "querying"
-        if accounter not in validaccounters :
+        validaccounters = [ "querying", "stupid", "external" ]     
+        try :
+            fullaccounter = self.getPrinterOption(printer, "accounter").strip().lower()
+        except PyKotaConfigError :    
+            fullaccounter = "querying"
+        if fullaccounter.startswith("external") :    
+            try :
+                (accounter, args) = [x.strip() for x in fullaccounter.split('(', 1)]
+            except ValueError :    
+                raise PyKotaConfigError, _("Invalid external accounter %s for printer %s") % (fullaccounter, printer)
+            if args.endswith(')') :
+                args = args[:-1]
+            if not args :
+                raise PyKotaConfigError, _("Invalid external accounter %s for printer %s") % (fullaccounter, printer)
+            return (accounter, args)    
+        elif fullaccounter not in validaccounters :
             raise PyKotaConfigError, _("Option accounter in section %s only supports values in %s") % (printer, str(validaccounters))
-        return accounter
+        else :    
+            return (fullaccounter, None)
         
     def getRequesterBackend(self, printer) :