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

minor clean-up of setup methods: remove duplicate code

Browse source 
git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3740 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2010-02-17 07:45:39 +00:00
parent d52b8efc19
commit 636a61524a
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
setup.py
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2008 Helmut Merz helmutm@cy55.de # Copyright (c) 2010 Helmut Merz helmutm@cy55.de
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -153,10 +153,7 @@ class SetupManager(object):
(attr, getName(concept), repr(value))) (attr, getName(concept), repr(value)))
def assignChild(self, conceptName, childName, predicate=None, **kw): def assignChild(self, conceptName, childName, predicate=None, **kw):
if predicate is None: predicate = self.getPredicate(predicate)
predicate = self.concepts.getDefaultPredicate()
if isinstance(predicate, basestring):
predicate = self.concepts[predicate]
concept = self.concepts[conceptName] concept = self.concepts[conceptName]
child = self.concepts[childName] child = self.concepts[childName]
if child in concept.getChildren([predicate]): if child in concept.getChildren([predicate]):
@ -168,14 +165,11 @@ class SetupManager(object):
(childName, conceptName, getName(predicate))) (childName, conceptName, getName(predicate)))
def deassignChild(self, conceptName, childName, predicate=None): def deassignChild(self, conceptName, childName, predicate=None):
if predicate is None: predicate = self.getPredicate(predicate)
predicate = self.concepts.getDefaultPredicate()
if isinstance(predicate, basestring):
predicate = self.concepts[predicate]
concept = self.concepts[conceptName] concept = self.concepts[conceptName]
child = self.concepts[childName] child = self.concepts[childName]
concept.deassignChild(child, [predicate]) concept.deassignChild(child, [predicate])
self.log("Concept '%s' deassigned from '%s' using predicate '%s'." % self.log("Concept '%s' deassigned from '%s' for predicate '%s'." %
(childName, conceptName, getName(predicate))) (childName, conceptName, getName(predicate)))
def addResource(self, name, title, resourceType, description=u'', **kw): def addResource(self, name, title, resourceType, description=u'', **kw):
@ -193,10 +187,7 @@ class SetupManager(object):
return c return c
def assignResource(self, conceptName, resourceName, predicate=None, **kw): def assignResource(self, conceptName, resourceName, predicate=None, **kw):
if predicate is None: predicate = self.getPredicate(predicate)
predicate = self.concepts.getDefaultPredicate()
if isinstance(predicate, basestring):
predicate = self.concepts[predicate]
concept = self.concepts[conceptName] concept = self.concepts[conceptName]
resource = self.resources[resourceName] resource = self.resources[resourceName]
if resource in concept.getResources([predicate]): if resource in concept.getResources([predicate]):
@ -208,14 +199,11 @@ class SetupManager(object):
(resourceName, conceptName, getName(predicate))) (resourceName, conceptName, getName(predicate)))
def deassignResource(self, conceptName, resourceName, predicate=None): def deassignResource(self, conceptName, resourceName, predicate=None):
if predicate is None: predicate = self.getPredicate(predicate)
predicate = self.concepts.getDefaultPredicate()
if isinstance(predicate, basestring):
predicate = self.concepts[predicate]
concept = self.concepts[conceptName] concept = self.concepts[conceptName]
resource = self.resources[resourceName] resource = self.resources[resourceName]
concept.deassignResource(resource, [predicate]) concept.deassignResource(resource, [predicate])
self.log("Resource '%s' deassigned from '%s' using predicate '%s'." % self.log("Resource '%s' deassigned from '%s' for predicate '%s'." %
(resourceName, conceptName, getName(predicate))) (resourceName, conceptName, getName(predicate)))
def addNode(self, name, title, container=None, nodeType='page', def addNode(self, name, title, container=None, nodeType='page',
@ -250,6 +238,13 @@ class SetupManager(object):
(target, name)) (target, name))
return n return n
def getPredicate(self, predicate):
if predicate is None:
return self.concepts.getDefaultPredicate()
if isinstance(predicate, basestring):
return self.concepts[predicate]
return predicate
def log(self, message): def log(self, message):
if isinstance(message, unicode): if isinstance(message, unicode):
message = message.encode('UTF-8') message = message.encode('UTF-8')
@ -302,7 +297,6 @@ class SetupView(object):
self.manager = ISetupManager(context) self.manager = ISetupManager(context)
def setupLoopsSite(self): def setupLoopsSite(self):
#self.manager.setupManagers()
self.manager.setup() self.manager.setup()
return 'Done' return 'Done'