Menu
▾
▴
[Collective-checkins] LindeMerkur/tool MerkurQueue.py,1.16,1.17 MerkurTool.py,1.16,1.17 __init__.py,1.2,1.3
|
From: Jens K. <ye...@us...> - 2005-02-11 20:30:16
|
Update of /cvsroot/collective/LindeMerkur/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12771/tool Modified Files: MerkurQueue.py MerkurTool.py __init__.py Log Message: regenerated from model some tests are failing :( added README.txt Index: MerkurQueue.py =================================================================== RCS file: /cvsroot/collective/LindeMerkur/tool/MerkurQueue.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- MerkurQueue.py 11 Feb 2005 16:07:24 -0000 1.16 +++ MerkurQueue.py 11 Feb 2005 20:29:09 -0000 1.17 @@ -6,11 +6,11 @@ """ # Copyright (c) 2005 by Klein & Partner KEG and Linde Verlag GmbH # -# Generated: Fri Feb 11 00:03:02 2005 +# Generated: Fri Feb 11 20:27:13 2005 # Generator: ArchGenXML Version 1.4 devel http://sf.net/projects/archetypes/ # # GNU General Public Licence (GPL) -# +# # 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 the Free Software # Foundation; either version 2 of the License, or (at your option) any later @@ -36,8 +36,11 @@ ##code-section module-header #fill in your manual code here from datetime import datetime -from OFS.SimpleItem import SimpleItem from Globals import InitializeClass +from Acquisition import aq_parent +from OFS.SimpleItem import SimpleItem +from Products.CMFCore.utils import getToolByName + ##/code-section module-header schema= Schema(( @@ -54,7 +57,7 @@ multiValued=0, relationship='queue2emission', ), - + ), ) @@ -69,10 +72,12 @@ def __init__(self, userid): self.id = userid - self._state = [STATE_NEW, datetime.now(), None] - self.doUpdateCatalog() + self._state = [(STATE_NEW, datetime.now(), None)] + # attention: the method which creates an object of this class has to + # call doUpdateCatalog afterwards, cause this method needs akquisition + #context - def getState(self): + def getStateInfo(self): return self._state def getLastState(self): @@ -104,13 +109,17 @@ self.doUpdateCatalog() def getQueueUID(self): - self._v_queueuid = uid = getattr(instance, '_v_queueuid', aq_parent(self)) + self._v_queueuid = uid = getattr(self, '_v_queueuid', aq_parent(self)) self.getQueueCatalog().catalog_object(self) return uid def doUpdateCatalog(self): - self._v_catalog = cat = getattr(instance, '_v_catalog', - getToolByName(self,'portal_merkurtool')) + if not hasattr(self,'_v_catalog'): + tool = getToolByName(self,'portal_merkurtool') + cat = tool.queue_catalog + self._v_catalog = cat + else: + cat = self._v_catalog cat.catalog_object(self) @@ -120,18 +129,20 @@ ##/code-section after-schema -class MerkurQueue(BaseBTreeFolder): +class MerkurQueue(BaseFolder): security = ClassSecurityInfo() __implements__ = (getattr(BaseFolder,'__implements__',()),) - portal_type = meta_type = 'MerkurQueue' - archetype_name = 'MerkurQueue' #this name appears in the 'add' box - allowed_content_types = ['MerkurMsgStub'] - filter_content_types = 1 + portal_type = meta_type = 'MerkurQueue' + archetype_name = 'MerkurQueue' #this name appears in the 'add' box + allowed_content_types = ['MerkurMsgStub'] + filter_content_types = 0 global_allow = 0 allow_discussion = 0 #content_icon = 'MerkurQueue.gif' immediate_view = 'base_view' + typeDescription = """MerkurQueue""" + typeDescMsgId = 'description_edit_merkurqueue' schema = BaseFolderSchema + \ schema @@ -139,15 +150,27 @@ ##code-section class-header #fill in your manual code here ##/code-section class-header + #Methods - def addMsgStubFor(userid): + def getNextMail(self): + """ + + """ + + pass + + #manually created methods + + def addMsgStubFor(self, userid): """ add a MerkurMsgStub and initialize with userid. A userid has to be unique, so its the same as the mailstubs id. """ o = MerkurMsgStub(userid) # using ugly OFS.ObjectManager API ... - self._setObject(id, o) + self._setObject(userid, o) + wrappedobj=self._getOb(userid) + wrappedobj.doUpdateCatalog() def getNextMsg(self): """ return the /next/ (next in a btree, means: random) message with @@ -161,8 +184,11 @@ """ pass + registerType(MerkurQueue) # end of class MerkurQueue ##code-section module-footer #fill in your manual code here ##/code-section module-footer + + Index: MerkurTool.py =================================================================== RCS file: /cvsroot/collective/LindeMerkur/tool/MerkurTool.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- MerkurTool.py 11 Feb 2005 16:07:25 -0000 1.16 +++ MerkurTool.py 11 Feb 2005 20:29:09 -0000 1.17 @@ -6,11 +6,11 @@ """ # Copyright (c) 2005 by Klein & Partner KEG and Linde Verlag GmbH # -# Generated: Fri Feb 11 00:03:02 2005 +# Generated: Fri Feb 11 20:27:13 2005 # Generator: ArchGenXML Version 1.4 devel http://sf.net/projects/archetypes/ # # GNU General Public Licence (GPL) -# +# # 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 the Free Software # Foundation; either version 2 of the License, or (at your option) any later @@ -37,7 +37,7 @@ from Products.CMFCore.utils import UniqueObject - + ##code-section module-header #fill in your manual code here from Products.ZCatalog.ZCatalog import manage_addZCatalog ##/code-section module-header @@ -58,14 +58,16 @@ security = ClassSecurityInfo() __implements__ = (getattr(UniqueObject,'__implements__',()),) + (getattr(BaseFolder,'__implements__',()),) - portal_type = meta_type = 'MerkurTool' - archetype_name = 'MerkurTool' #this name appears in the 'add' box - allowed_content_types = ['MerkurQueue'] - filter_content_types = 1 + portal_type = meta_type = 'MerkurTool' + archetype_name = 'MerkurTool' #this name appears in the 'add' box + allowed_content_types = ['MerkurQueue'] + filter_content_types = 0 global_allow = 0 allow_discussion = 0 #content_icon = 'MerkurTool.gif' immediate_view = 'base_view' + typeDescription = """MerkurTool""" + typeDescMsgId = 'description_edit_merkurtool' schema = BaseFolderSchema + \ schema @@ -77,10 +79,9 @@ # tool-constructors have no id argument, the id is fixed def __init__(self, id=None): BaseFolder.__init__(self,'portal_merkurtool') - - - + ##code-section constructor-footer #fill in your manual code here + self.setTitle('Linde Merkur Portal Tool') # add a catalog for alls the msgstubs manage_addZCatalog(self, @@ -104,10 +105,10 @@ def getQueues(self): """ - + returns all queues containing items to process """ - - pass + # XXX constrain to queues in a given Workflow state + return self.contentValues() registerType(MerkurTool) @@ -115,3 +116,5 @@ ##code-section module-footer #fill in your manual code here ##/code-section module-footer + + Index: __init__.py =================================================================== RCS file: /cvsroot/collective/LindeMerkur/tool/__init__.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- __init__.py 9 Feb 2005 20:13:43 -0000 1.2 +++ __init__.py 11 Feb 2005 20:29:09 -0000 1.3 @@ -1,13 +1,15 @@ +# Initialise this package. You may add your own code in the protected sections +# below. + ##code-section init-module-header #fill in your manual code here ##/code-section init-module-header + #subpackages - #classes import MerkurTool import MerkurQueue ##code-section init-module-footer #fill in your manual code here ##/code-section init-module-footer - |