# HG changeset patch
# User Sandro Knauß <knauss@netzguerilla.net>
# Date 1329590828 -3600
# Node ID 2a16943f1d05df0335dc8cc64bb4529f7a38c494
# Parent  aabc04843d253ad4abdc1ef585a2f46cbe90d602
regression fixes

diff -r aabc04843d25 -r 2a16943f1d05 iro/model/offer.py
--- a/iro/model/offer.py	Sat Feb 18 17:13:38 2012 +0100
+++ b/iro/model/offer.py	Sat Feb 18 19:47:08 2012 +0100
@@ -13,7 +13,7 @@
         if p not in ret and user.has_right(typ, offer_name = p): 
                 ret.append(p)
         elif user.providers(typ).filter(schema.Offer.provider==p).first():
-            for r in providers[p].routes:
+            for r in providers[p].typs[typ]:
                 n = user.has_right(typ, provider=p, route=r)
                 if n and n not in ret:
                     ret.append(n)
@@ -25,10 +25,10 @@
     providers.clear()
     for provider in ( s for s in config.sections() if not s in ["main",]):
         p=getProvider(provider,config.get(provider,"typ"),config.items(provider))
-        for r in p.routes:
-            for o in  session.query(schema.Offer.name, schema.Offer.typ).filter(and_(schema.Offer.provider==provider,
-                schema.Offer.route==r)):
-                    offers[o[0]]=Offer(provider=p,route=r,typ=o[1],name=o[0])
+        for t in p.typs:
+            for r in p.typs[t]:
+                n = session.query(schema.Offer.name).filter(and_(schema.Offer.provider==provider, schema.Offer.route==r, schema.Offer.typ==t)).scalar()
+                offers[n]=Offer(provider=p,route=r,typ=t,name=n)
         providers[provider]=p
 
 offers={}
diff -r aabc04843d25 -r 2a16943f1d05 tests/job.py
--- a/tests/job.py	Sat Feb 18 17:13:38 2012 +0100
+++ b/tests/job.py	Sat Feb 18 19:47:08 2012 +0100
@@ -133,7 +133,7 @@
             o=DBOffer(name="test", provider="bla", route="basic", typ="sms")
             u.rights.append(Userright(o)) 
         
-        p=Provider(name="p", config={}, routes=["test"])
+        p=Provider(name="p", config={}, typs={"sms":["test",]})
         def send(typ,route,recipient,message):
             return Status(provider=p, route=route, error="Error: Test")
         p.send=send
diff -r aabc04843d25 -r 2a16943f1d05 tests/offer.py
--- a/tests/offer.py	Sat Feb 18 17:13:38 2012 +0100
+++ b/tests/offer.py	Sat Feb 18 19:47:08 2012 +0100
@@ -67,7 +67,7 @@
             o=DBOffer(name="oh", provider="bla", route="a", typ="sms")
             u.rights.append(Userright(o)) 
         
-        offer.providers={"bla":Provider("bla", [], ["a","b","c"])}
+        offer.providers={"bla":Provider("bla", [], {"sms":["a","b","c"]})}
 
         for l in [['bla'],['oh'],['oh','bla'],['bla','oh']]:
             ret = yield offer.extendProvider(u, "sms", l)
@@ -84,7 +84,7 @@
             o=DBOffer(name="a", provider="bla", route="b", typ="sms")
             u.rights.append(Userright(o)) 
         
-        offer.providers={"bla":Provider("bla", [], ["a","b","c"])}
+        offer.providers={"bla":Provider("bla", [], {"sms":["a","b","c"]})}
 
         ret = yield offer.extendProvider(u, "sms",  ["bla"])
         self.assertEqual(ret, ["oh","a"])
@@ -100,7 +100,7 @@
         
         class TestProvider(Provider):
             def __init__(self,name,config):
-                Provider.__init__(self,name,config,["a",])
+                Provider.__init__(self,name,config,{"sms":["a",]})
         
         with self.session() as session:
             session.add(DBOffer(name="oh", provider="p", route="a", typ="sms"))