[Erp5-report] r14040 - in /erp5/trunk/products/CMFActivity/Activity: SQLDict.py SQLQueue.py

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Apr 11 09:50:16 2007
New Revision: 14040

URL: http://svn.erp5.org?rev=14040&view=rev
Log:
Portal ids will not change between 2 activity store, so better do the traversal just once.

Modified:
    erp5/trunk/products/CMFActivity/Activity/SQLDict.py
    erp5/trunk/products/CMFActivity/Activity/SQLQueue.py

Modified: erp5/trunk/products/CMFActivity/Activity/SQLDict.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLDict.py?rev=14040&r1=14039&r2=14040&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLDict.py (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLDict.py Wed Apr 11 09:50:16 2007
@@ -477,6 +477,7 @@
       path_dict = {}
       assignMessage = activity_tool.SQLDict_assignMessage
       processing_node = 1
+      id_tool = activity_tool.getPortalObject().portal_ids
       for message in message_dict.itervalues():
         path = '/'.join(message.object_path)
         broadcast = message.activity_kw.get('broadcast', 0)
@@ -485,7 +486,6 @@
           uid = message.uid
           assignMessage(processing_node=1, uid=[uid])
           if node_count > 1:
-            id_tool = activity_tool.getPortalObject().portal_ids
             uid_list = id_tool.generateNewLengthIdList(id_group='portal_activity',
                                                        id_count=node_count - 1)
             path_list = [path] * (node_count - 1)

Modified: erp5/trunk/products/CMFActivity/Activity/SQLQueue.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLQueue.py?rev=14040&r1=14039&r2=14040&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLQueue.py (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLQueue.py Wed Apr 11 09:50:16 2007
@@ -321,6 +321,7 @@
       path_dict = {}
       assignMessage = activity_tool.SQLQueue_assignMessage
       processing_node = 1
+      id_tool = activity_tool.getPortalObject().portal_ids
       for message in message_dict.itervalues():
         path = '/'.join(message.object_path)
         broadcast = message.activity_kw.get('broadcast', 0)
@@ -328,7 +329,6 @@
           # Broadcast messages must be distributed into all nodes.
           assignMessage(processing_node=1, uid=message.uid)
           if node_count > 1:
-            id_tool = activity_tool.getPortalObject().portal_ids
             uid_list = id_tool.generateNewLengthIdList(id_group='portal_activity_queue',
                                                        id_count=node_count - 1)
             priority = message.activity_kw.get('priority', 1)