getMessageList support now the parameter include_processing

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5768 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/CMFActivity/Activity/Queue.py

@@ -186,7 +186,7 @@ class Queue:
   def dumpMessage(self, m):
     return pickle.dumps(m)
 
-  def getMessageList(self, activity_tool, processing_node=None):
+  def getMessageList(self, activity_tool, processing_node=None,**kw):
     return []  
   
   # Transaction Management

product/CMFActivity/Activity/RAMDict.py

@@ -153,7 +153,7 @@ class RAMDict(Queue):
         else:            
           self.deleteMessage(activity_tool, m)
 
-  def getMessageList(self, activity_tool, processing_node=None):
+  def getMessageList(self, activity_tool, processing_node=None,**kw):
     new_queue = []
     for m in self.getDict(activity_tool).values():
       m.processing_node = 1

product/CMFActivity/Activity/RAMQueue.py

@@ -122,7 +122,7 @@ class RAMQueue(Queue):
           else:              
             self.deleteMessage(activity_tool, m)
 
-  def getMessageList(self, activity_tool, processing_node=None):
+  def getMessageList(self, activity_tool, processing_node=None,**kw):
     new_queue = []
     for m in self.getQueue(activity_tool):
       m.processing_node = 1

product/CMFActivity/Activity/SQLDict.py

@@ -390,7 +390,8 @@ class SQLDict(RAMDict):
                 raise ActivityFlushError, (
                     'The document %s does not exist' % path)
       # Parse each message in SQL dict
-      result = activity_tool.SQLDict_readMessageList(path=path, method_id=method_id,processing_node=None)
+      result = activity_tool.SQLDict_readMessageList(path=path, method_id=method_id,
+                             processing_node=None,include_processing=0)
       for line in result:
         path = line.path
         method_id = line.method_id
@@ -417,15 +418,16 @@ class SQLDict(RAMDict):
               raise ActivityFlushError, (
                   'The document %s does not exist' % path)
 
-  def getMessageList(self, activity_tool, processing_node=None):
+  def getMessageList(self, activity_tool, processing_node=None,include_processing=0,**kw):
     # YO: reading all lines might cause a deadlock
     message_list = []
     if hasattr(activity_tool,'SQLDict_readMessageList'):
-      result = activity_tool.SQLDict_readMessageList(path=None, method_id=None, processing_node=None, to_processing_date=None)
+      result = activity_tool.SQLDict_readMessageList(path=None, method_id=None, processing_node=None, to_processing_date=None,include_processing=include_processing)
       for line in result:
         m = self.loadMessage(line.message, uid = line.uid)
         m.processing_node = line.processing_node
         m.priority = line.priority
+        m.processing = line.processing
         message_list.append(m)
     return message_list
 
@@ -450,7 +452,8 @@ class SQLDict(RAMDict):
       else:
         max_processing_date = None
       result = activity_tool.SQLDict_readMessageList(path=None, method_id=None, processing_node = -1,
-                                                     to_processing_date = max_processing_date) # Only assign non assigned messages
+                                                     to_processing_date = max_processing_date,
+                                                     include_processing=0) # Only assign non assigned messages
       get_transaction().commit() # Release locks before starting a potentially long calculation
       path_dict = {}
       for line in result:

product/CMFActivity/Activity/SQLQueue.py

@@ -200,7 +200,7 @@ class SQLQueue(RAMQueue):
   #   uid_list = activity_tool.SQLQueue_readUidList(path=path, active_process=active_process)
   #   activity_tool.SQLQueue_assignMessage(uid = uid_list, processing_node = STOP_STATE)
 
-  def getMessageList(self, activity_tool, processing_node=None):
+  def getMessageList(self, activity_tool, processing_node=None,**kw):
     message_list = []
     if hasattr(activity_tool,'SQLQueue_readMessageList'):
       result = activity_tool.SQLQueue_readMessageList(path=None, method_id=None, processing_node=None)

product/CMFActivity/ActivityTool.py

@@ -97,6 +97,7 @@ class Message:
     self.kw = kw
     self.is_executed = 0
     self.exc_type = None
+    self.processing = None
     self.user_name = str(_getAuthenticatedUser(self))
     # Store REQUEST Info ?
 
@@ -782,7 +783,7 @@ class ActivityTool (Folder, UniqueObject):
         return REQUEST.RESPONSE.redirect('%s/%s' % (self.absolute_url(), 'manageActivitiesAdvanced?manage_tabs_message=Activities%20Cleared')) 
 
     security.declarePublic('getMessageList')
-    def getMessageList(self):
+    def getMessageList(self,**kw):
       """
         List messages waiting in queues
       """
@@ -792,7 +793,7 @@ class ActivityTool (Folder, UniqueObject):
       message_list = []
       for activity in activity_list:
         try:
-          message_list += activity.getMessageList(self)
+          message_list += activity.getMessageList(self,**kw)
         except AttributeError:
           LOG('getMessageList, could not get message from Activity:',0,activity)
       return message_list

product/CMFActivity/skins/activity/SQLDict_readMessageList.zsql

@@ -11,7 +11,8 @@ class_file:
 method_id
 processing_node
 priority
-to_processing_date</params>
+to_processing_date
+include_processing</params>
 <dtml-if to_processing_date>UPDATE message
 SET
   processing = 0
@@ -25,7 +26,10 @@ AND
 </dtml-if>SELECT * FROM
     message
 WHERE
-    processing <> 1
+1 = 1
+<dtml-if expr="not(include_processing)">
+    AND processing <> 1
+</dtml-if>
 <dtml-if processing_node> AND processing_node = <dtml-sqlvar processing_node type="int"> </dtml-if>
 <dtml-if priority> AND priority = <dtml-sqlvar priority type="int"> </dtml-if>
 <dtml-if path>AND path = <dtml-sqlvar path type="string"> </dtml-if>