diff -r c83a8ecb9bf5 -r 5308b3fe03c9 server/sources/__init__.py --- a/server/sources/__init__.py Mon Jun 17 00:15:51 2013 +0200 +++ b/server/sources/__init__.py Wed Jan 22 10:19:30 2014 +0100 @@ -85,10 +85,6 @@ # a reference to the instance'schema (may differs from the source'schema) schema = None - # multi-sources planning control - dont_cross_relations = () - cross_relations = () - # force deactivation (configuration error for instance) disabled = False @@ -310,22 +306,6 @@ return wsupport return True - def may_cross_relation(self, rtype): - """return True if the relation may be crossed among sources. Rules are: - - * if this source support the relation, can't be crossed unless explicitly - specified in .cross_relations - - * if this source doesn't support the relation, can be crossed unless - explicitly specified in .dont_cross_relations - """ - # XXX find a way to have relation such as state_of in dont cross - # relation (eg composite relation without both end type available? - # card 1 relation ? ...) - if self.support_relation(rtype): - return rtype in self.cross_relations - return rtype not in self.dont_cross_relations - def before_entity_insertion(self, session, lid, etype, eid, sourceparams): """called by the repository when an eid has been attributed for an entity stored here but the entity has not been inserted in the system