[Erp5-report] r19425 - in /erp5/trunk/products/CMFActivity: Activity/ skins/activity/

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Feb 20 10:39:01 2008
New Revision: 19425

URL: http://svn.erp5.org?rev=19425&view=rev
Log:
Compute boundary date inside priority-computing ZSQLMethods instead of using a separate one.

Modified:
    erp5/trunk/products/CMFActivity/Activity/SQLBase.py
    erp5/trunk/products/CMFActivity/skins/activity/SQLDict_getPriority.zsql
    erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_getPriority.zsql

Modified: erp5/trunk/products/CMFActivity/Activity/SQLBase.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLBase.py?rev=19425&r1=19424&r2=19425&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLBase.py (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLBase.py Wed Feb 20 10:39:01 2008
@@ -43,8 +43,7 @@
     return result[0][0]
 
   def _getPriority(self, activity_tool, method, default):
-    now_date = self.getNow(activity_tool)
-    result = method(to_date=now_date)
+    result = method()
     assert len(result) == 1
     priority = result[0]['priority']
     if priority is None:

Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_getPriority.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_getPriority.zsql?rev=19425&r1=19424&r2=19425&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_getPriority.zsql (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_getPriority.zsql Wed Feb 20 10:39:01 2008
@@ -8,11 +8,10 @@
 class_file:
 </dtml-comment>
 <params>
-to_date
 </params>
 SELECT MIN(`priority`) AS `priority` FROM
   message
 WHERE
   processing_node = 0
-  AND date <= <dtml-sqlvar to_date type="datetime">
+  AND date <= UTC_TIMESTAMP()
 

Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_getPriority.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_getPriority.zsql?rev=19425&r1=19424&r2=19425&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_getPriority.zsql (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_getPriority.zsql Wed Feb 20 10:39:01 2008
@@ -8,11 +8,10 @@
 class_file:
 </dtml-comment>
 <params>
-to_date
 </params>
 SELECT MIN(`priority`) AS `priority` FROM
   message_queue
 WHERE
   processing_node = 0
-  AND date <= <dtml-sqlvar to_date type="datetime">
+  AND date <= UTC_TIMESTAMP()