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

Timestamp:

02/10/03 01:42:17 (21 years ago)

Author:

jalet

Message:

External requester should be ok (untested)
New syntax for configuration file wrt requesters

Files:

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

pykota/trunk/pykota/config.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.8  2003/02/10 00:42:17  jalet
+# External requester should be ok (untested)
+# New syntax for configuration file wrt requesters
+#
 # Revision 1.7  2003/02/09 13:05:43  jalet
 # Internationalization continues...
@@ -95 +99 @@
                 raise PyKotaConfigError, _("Option policy in section %s only supports values in %s") % (printer, str(validpolicies))
             
-            validrequesters = [ "snmp" ] # TODO : add more requesters
-            requester = self.config.get(printer, "requester").lower()
-            if requester not in validrequesters :
-                raise PyKotaConfigError, _("Option requester in section %s only supports values in %s") % (printer, str(validrequesters))
-            if requester == "snmp" :
-                for poption in [ "snmpcmnty", "snmpoid" ] : 
-                    if not self.config.has_option(printer, poption) :
-                        raise PyKotaConfigError, _("Option %s not found in section %s of %s") % (option, printer, self.filename)
+            validrequesters = [ "snmp", "external" ] # TODO : add more requesters
+            fullrequester = self.config.get(printer, "requester")
+            try :
+                (requester, args) = [x.strip() for x in fullrequester.split('('))]
+            except ValueError :    
+                raise PyKotaConfigError, _("Invalid requester for printer %s") % printer
+            else :
+                if requester not in validrequesters :
+                    raise PyKotaConfigError, _("Option requester for printer %s only supports values in %s") % (printer, str(validrequesters))
                         
     def getPrinterNames(self) :    
@@ -128 +133 @@
         
     def getRequesterBackend(self, printer) :    
-        """Returns the requester backend to use for a given printer."""
-        return self.config.get(printer, "requester").lower()
+        """Returns the requester backend to use for a given printer, with its arguments."""
+        fullrequester = self.config.get(printer, "requester")
+        (requester, args) = [x.strip() for x in fullrequester.split('('))]
+        if args.endswith(')') :
+            args = args[:-1]
+        args = [x.strip() for x in args.split(',')]
+        if not args :
+            raise PyKotaConfigError, _("Invalid requester for printer %s") % printer
+        return (requester, args)
         
     def getPrinterPolicy(self, printer) :