diff -r c29acd5fb841 -r 71f1108758ef iro/model/offer.py --- a/iro/model/offer.py Sun Feb 19 17:47:39 2012 +0100 +++ b/iro/model/offer.py Sun Feb 19 17:49:00 2012 +0100 @@ -1,5 +1,4 @@ from .dbdefer import dbdefer -from sqlalchemy import and_ import schema from ..config import config @@ -27,7 +26,7 @@ p=getProvider(provider,config.get(provider,"typ"),config.items(provider)) 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() + n = schema.Offer.get(session, provider, r, t).name offers[n]=Offer(provider=p,route=r,typ=t,name=n) providers[provider]=p