Pass a list instead of iterating.

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

product/CMFActivity/Activity/SQLDict.py

@@ -317,12 +317,11 @@ class SQLDict(RAMDict):
     # Count number of occurances of method_id
     if type(value) == type(''):
       value = [value]
-    for method_id in value:
-      result = activity_tool.SQLDict_validateMessageList(method_id=method_id, message_uid=None, path=None)
-      LOG('SQLDict._validate_after_method_id, method_id',0,method_id)
-      LOG('SQLDict._validate_after_method_id, result[0].uid_count',0,result[0].uid_count)
-      if result[0].uid_count > 0:
-        return INVALID_ORDER
+    result = activity_tool.SQLDict_validateMessageList(method_id=value, message_uid=None, path=None)
+    LOG('SQLDict._validate_after_method_id, method_id',0,value)
+    LOG('SQLDict._validate_after_method_id, result[0].uid_count',0,result[0].uid_count)
+    if result[0].uid_count > 0:
+      return INVALID_ORDER
     return VALID
 
   def _validate_after_path(self, activity_tool, message, value):

product/CMFActivity/skins/activity/SQLDict_validateMessageList.zsql

@@ -17,6 +17,12 @@ FROM
     message
 WHERE
     processing_node >= -1
-<dtml-if method_id>AND method_id = <dtml-sqlvar method_id type="string"> </dtml-if>
+<dtml-if method_id>
+    AND (
+<dtml-in method_id>
+        method_id = <dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else> OR </dtml-if>
+</dtml-in>
+    )
+</dtml-if>
 <dtml-if message_uid>AND uid = <dtml-sqlvar message_uid type="int"> </dtml-if>
 <dtml-if path>AND path = <dtml-sqlvar path type="string"></dtml-if>