server/schemaserial.py
changeset 9963 5531f5577b50
parent 9959 6047bf8df9e5
child 9964 f4a3ee05cf9d
equal deleted inserted replaced
9962:64b573d54133 9963:5531f5577b50
   360             if pb is not None:
   360             if pb is not None:
   361                 pb.update()
   361                 pb.update()
   362             continue
   362             continue
   363         if rschema.rule:
   363         if rschema.rule:
   364             execschemarql(execute, rschema, crschema2rql(rschema))
   364             execschemarql(execute, rschema, crschema2rql(rschema))
       
   365             if pb is not None:
       
   366                 pb.update()
   365             continue
   367             continue
   366         execschemarql(execute, rschema, rschema2rql(rschema, addrdef=False))
   368         execschemarql(execute, rschema, rschema2rql(rschema, addrdef=False))
   367         if rschema.symmetric:
   369         if rschema.symmetric:
   368             rdefs = [rdef for k, rdef in rschema.rdefs.iteritems()
   370             rdefs = [rdef for k, rdef in rschema.rdefs.iteritems()
   369                      if (rdef.subject, rdef.object) == k]
   371                      if (rdef.subject, rdef.object) == k]
   509     relations, values = crschema_relations_values(crschema)
   511     relations, values = crschema_relations_values(crschema)
   510     yield 'INSERT CWComputedRType X: %s' % ','.join(relations), values
   512     yield 'INSERT CWComputedRType X: %s' % ','.join(relations), values
   511 
   513 
   512 def crschema_relations_values(crschema):
   514 def crschema_relations_values(crschema):
   513     values = _ervalues(crschema)
   515     values = _ervalues(crschema)
   514     values['rule'] = crschema.rule
   516     values['rule'] = unicode(crschema.rule)
   515     # XXX why oh why?
   517     # XXX why oh why?
   516     del values['final']
   518     del values['final']
   517     relations = ['X %s %%(%s)s' % (attr, attr) for attr in sorted(values)]
   519     relations = ['X %s %%(%s)s' % (attr, attr) for attr in sorted(values)]
   518     return relations, values
   520     return relations, values
   519 
   521