# HG changeset patch
# User Sandro Knauß <knauss@netzguerilla.net>
# Date 1256695426 -3600
# Node ID cec27aeb7e69fa2fcece031cf163950acd951e18
# Parent  07dd2663ac909119cac8b7dc8814ee83d66d1b60
iro.py angepasst an neune struktur

diff -r 07dd2663ac90 -r cec27aeb7e69 iro/iro.py
--- a/iro/iro.py	Wed Oct 28 02:35:01 2009 +0100
+++ b/iro/iro.py	Wed Oct 28 03:03:46 2009 +0100
@@ -19,6 +19,11 @@
 import anbieter
 import ConfigParser
 
+
+from job import MessageJob
+from joblist import Joblist
+from providerlist import Providerlist
+
 class MyUserDB(UserDB):
     def __init__(self, userlist,jobqueue):
         UserDB.__init__(self, None,userlist,jobqueue)
@@ -101,11 +106,17 @@
     
     #Benutzerdatenbank erstellen
     queue = Queue()
-    provider={"sms":{"sipgate":sip, "smstrade":smstrade, "default":sip, }, 
-                    "fax":{"sipgate":sip, "default":sip, }, 
-                    "mail":{"localhost":localhost, "default":localhost, }, }
+    provider=Providerlist()
+    provider.add("sipgate", sip, ["sms", "fax", ])
+    provider.add("smstrade", smstrade, ["sms", ])
+    provider.add("geonet", None, ["sms", "fax", ])
+    provider.add("fax.de", None, ["sms", "fax", ])
+    provider.add("localhost", localhost, ["mail", ])
+    provider.setDefault("sms","smstrade")
+    provider.setDefault("fax","sipgate")
+    provider.setDefault("mail","localhost")
+    jobqueue=Joblist(manager,  queue, provider)
     
-    jobqueue=Jobs(manager,  queue, provider)
     userdb=MyUserDB(userlist,jobqueue)
 
     #working thread erstellen