cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backport changes from bbmaster branch

Browse source
This commit is contained in:
Helmut Merz 2011-12-04 11:42:49 +01:00
parent a8aa186214
commit c963f05964
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
common.py
View file

@ -332,10 +332,6 @@ class RelationSet(object):
def __init__(self, context, predicateName, interface=None, noSecurityCheck=False): def __init__(self, context, predicateName, interface=None, noSecurityCheck=False):
self.adapted = context self.adapted = context
self.context = baseObject(context) self.context = baseObject(context)
#if isinstance(context, AdapterBase):
# self.context = context.context
#else:
# self.context = context
self.predicateName = predicateName self.predicateName = predicateName
self.interface = interface self.interface = interface
self.noSecurityCheck = noSecurityCheck self.noSecurityCheck = noSecurityCheck
@ -350,23 +346,18 @@ class RelationSet(object):
@Lazy @Lazy
def predicate(self): def predicate(self):
#return self.conceptManager[self.predicateName]
return self.conceptManager.get(self.predicateName) return self.conceptManager.get(self.predicateName)
class ParentRelationSet(RelationSet): class ParentRelationSet(RelationSet):
def add(self, related, order=0, relevance=1.0): def add(self, related, order=0, relevance=1.0):
#if isinstance(related, AdapterBase):
# related = related.context
related = baseObject(related) related = baseObject(related)
self.context.deassignParent(related, [self.predicate], # avoid duplicates self.context.deassignParent(related, [self.predicate], # avoid duplicates
noSecurityCheck=self.noSecurityCheck) noSecurityCheck=self.noSecurityCheck)
self.context.assignParent(related, self.predicate, order, relevance) self.context.assignParent(related, self.predicate, order, relevance)
def remove(self, related): def remove(self, related):
#if isinstance(related, AdapterBase):
# related = related.context
self.context.deassignParent(baseObject(related), [self.predicate]) self.context.deassignParent(baseObject(related), [self.predicate])
def __iter__(self): def __iter__(self):
@ -396,14 +387,12 @@ class ParentRelationSet(RelationSet):
class ChildRelationSet(RelationSet): class ChildRelationSet(RelationSet):
def add(self, related, order=0, relevance=1.0): def add(self, related, order=0, relevance=1.0):
if isinstance(related, AdapterBase): related = baseObject(related)
related = related.context
self.context.deassignChild(related, [self.predicate]) # avoid duplicates self.context.deassignChild(related, [self.predicate]) # avoid duplicates
self.context.assignChild(related, self.predicate, order, relevance) self.context.assignChild(related, self.predicate, order, relevance)
def remove(self, related): def remove(self, related):
if isinstance(related, AdapterBase): related = baseObject(related.context)
related = related.context
self.context.deassignChild(related, [self.predicate]) self.context.deassignChild(related, [self.predicate])
def __iter__(self): def __iter__(self):
@ -412,6 +401,16 @@ class ChildRelationSet(RelationSet):
for c in self.context.getChildren([self.predicate]): for c in self.context.getChildren([self.predicate]):
yield adapted(c, langInfo=self.langInfo) yield adapted(c, langInfo=self.langInfo)
def getRelations(self, check=None, noSecurityCheck=None):
if self.adapted.__is_dummy__:
return
if noSecurityCheck is None:
noSecurityCheck = self.noSecurityCheck
for r in self.context.getChildRelations([self.predicate],
noSecurityCheck=noSecurityCheck):
if check is None or check(r):
yield r
# property descriptors # property descriptors
@ -480,12 +479,14 @@ class ParentRelation(object):
return None return None
def __set__(self, inst, value): def __set__(self, inst, value):
s = ParentRelationSet(inst, self.predicateName) rs = ParentRelationSet(inst, self.predicateName)
for current in s: rsList = list(rs)
for current in rsList:
if current != value: if current != value:
s.remove(current) rs.remove(current)
if value is not None: if value is not None:
s.add(value) # how to supply additional parameters? if value not in rsList:
rs.add(value) # how to supply additional parameters?
# records/tracks # records/tracks