--- 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={}