[Erp5-report] r25481 - /erp5/trunk/products/CMFActivity/Activity/

[nobody at svn.erp5.org]

Author: jm
Date: Fri Feb  6 17:01:32 2009
New Revision: 25481

URL: http://svn.erp5.org?rev=25481&view=rev
Log:
Move _validate_* methods from SQLDict and SQLQueue to SQLBase, and fix checking of parameters (cf r24586).

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

Modified: erp5/trunk/products/CMFActivity/Activity/SQLBase.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLBase.py?rev=25481&r1=25480&r2=25481&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLBase.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLBase.py [utf8] Fri Feb  6 17:01:32 2009
@@ -26,7 +26,7 @@
 #
 ##############################################################################
 
-from zLOG import LOG, INFO
+from zLOG import LOG, INFO, WARNING
 from ZODB.POSException import ConflictError
 
 class SQLBase:
@@ -67,3 +67,32 @@
         break
     return result
 
+  def _validate_after_method_id(self, activity_tool, message, value):
+    return self._validate(activity_tool, method_id=value)
+
+  def _validate_after_path(self, activity_tool, message, value):
+    return self._validate(activity_tool, path=value)
+
+  def _validate_after_message_uid(self, activity_tool, message, value):
+    return self._validate(activity_tool, message_uid=value)
+
+  def _validate_after_path_and_method_id(self, activity_tool, message, value):
+    if not (isinstance(value, (tuple, list)) and len(value) == 2):
+      LOG('CMFActivity', WARNING,
+          'unable to recognize value for after_path_and_method_id: %r' % (value,))
+      return []
+    return self._validate(activity_tool, path=value[0], method_id=value[1])
+
+  def _validate_after_tag(self, activity_tool, message, value):
+    return self._validate(activity_tool, tag=value)
+
+  def _validate_after_tag_and_method_id(self, activity_tool, message, value):
+    # Count number of occurances of tag and method_id
+    if not (isinstance(value, (tuple, list)) and len(value) == 2):
+      LOG('CMFActivity', WARNING,
+          'unable to recognize value for after_tag_and_method_id: %r' % (value,))
+      return []
+    return self._validate(activity_tool, tag=value[0], method_id=value[1])
+
+  def _validate_serialization_tag(self, activity_tool, message, value):
+    return self._validate(activity_tool, serialization_tag=value)

Modified: erp5/trunk/products/CMFActivity/Activity/SQLDict.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLDict.py?rev=25481&r1=25480&r2=25481&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLDict.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLDict.py [utf8] Fri Feb  6 17:01:32 2009
@@ -685,36 +685,6 @@
     else:
       return []
 
-  def _validate_after_method_id(self, activity_tool, message, value):
-    return self._validate(activity_tool, method_id=value)
-
-  def _validate_after_path(self, activity_tool, message, value):
-    return self._validate(activity_tool, path=value)
-
-  def _validate_after_message_uid(self, activity_tool, message, value):
-    return self._validate(activity_tool, message_uid=value)
-
-  def _validate_after_path_and_method_id(self, activity_tool, message, value):
-    if not (isinstance(value, (tuple, list)) or len(value) == 2):
-      LOG('CMFActivity', WARNING,
-          'unable to recognize value for after_path_and_method_id: %r' % (value,))
-      return []
-    return self._validate(activity_tool, path=value[0], method_id=value[1])
-
-  def _validate_after_tag(self, activity_tool, message, value):
-    return self._validate(activity_tool, tag=value)
-
-  def _validate_after_tag_and_method_id(self, activity_tool, message, value):
-    # Count number of occurances of tag and method_id
-    if not isinstance(value, (tuple, list)) or len(value) < 2:
-      LOG('CMFActivity', WARNING,
-          'unable to recognize value for after_tag_and_method_id: %r' % (value,))
-      return []
-    return self._validate(activity_tool, tag=value[0], method_id=value[1])
-
-  def _validate_serialization_tag(self, activity_tool, message, value):
-    return self._validate(activity_tool, serialization_tag=value)
-
   def countMessage(self, activity_tool, tag=None, path=None,
                    method_id=None, message_uid=None, **kw):
     """Return the number of messages which match the given parameters.

Modified: erp5/trunk/products/CMFActivity/Activity/SQLQueue.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLQueue.py?rev=25481&r1=25480&r2=25481&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLQueue.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLQueue.py [utf8] Fri Feb  6 17:01:32 2009
@@ -530,35 +530,6 @@
     else:
       return []
 
-  def _validate_after_method_id(self, activity_tool, message, value):
-    return self._validate(activity_tool, method_id=value)
-
-  def _validate_after_path(self, activity_tool, message, value):
-    return self._validate(activity_tool, path=value)
-
-  def _validate_after_message_uid(self, activity_tool, message, value):
-    return self._validate(activity_tool, message_uid=value)
-
-  def _validate_after_path_and_method_id(self, activity_tool, message, value):
-    if not (isinstance(value, (tuple, list)) and len(value) == 2):
-      LOG('CMFActivity', WARNING,
-          'unable to recognize value for after_path_and_method_id: %r' % (value,))
-      return []
-    return self._validate(activity_tool, path=value[0], method_id=value[1])
-
-  def _validate_after_tag(self, activity_tool, message, value):
-    return self._validate(activity_tool, tag=value)
-
-  def _validate_after_tag_and_method_id(self, activity_tool, message, value):
-    if not isinstance(value, (tuple, list)) or len(value) < 2:
-      LOG('CMFActivity', WARNING,
-          'unable to recognize value for after_tag_and_method_id: %r' % (value,))
-      return []
-    return self._validate(activity_tool, tag=value[0], method_id=value[1])
-
-  def _validate_serialization_tag(self, activity_tool, message, value):
-    return self._validate(activity_tool, serialization_tag=value)
-
   # Required for tests (time shift)
   def timeShift(self, activity_tool, delay, processing_node = None):
     """