diff -r a0b6714e84f1 -r 273f9e4e6d19 server/schemaserial.py --- a/server/schemaserial.py Tue Dec 08 12:46:45 2009 +0100 +++ b/server/schemaserial.py Tue Dec 08 14:53:59 2009 +0100 @@ -363,7 +363,7 @@ def _rdef_values(rschema, objtype, props): amap = {'order': 'ordernum'} values = {} - for prop, default in rschema.rproperty_defs(objtype).iteritems(): + for prop, default in schemamod.RelationDefinitionSchema.rproperty_defs(objtype).iteritems(): if prop in ('eid', 'constraints', 'uid', 'infered', 'permissions'): continue value = props.get(prop, default) @@ -395,7 +395,8 @@ return relations, values -def __rdef2rql(genmap, rschema, subjtype=None, objtype=None, props=None, groupmap=None): +def __rdef2rql(genmap, rschema, subjtype=None, objtype=None, props=None, + groupmap=None): if subjtype is None: assert objtype is None assert props is None @@ -445,8 +446,8 @@ def erschema2rql(erschema, groupmap): if isinstance(erschema, schemamod.EntitySchema): - return eschema2rql(erschema, groupmap) - return rschema2rql(erschema) + return eschema2rql(erschema, groupmap=groupmap) + return rschema2rql(erschema, groupmap=groupmap) def eschema2rql(eschema, groupmap): """return a list of rql insert statements to enter an entity schema