[Erp5-report] r25253 - in /erp5/trunk/products/CMFActivity: Activity/ skins/activity/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jan 22 13:16:04 CET 2009
Author: vincent
Date: Thu Jan 22 13:16:03 2009
New Revision: 25253
URL: http://svn.erp5.org?rev=25253&view=rev
Log:
Rename "limit" parameter to ZSQLMethods into "count", as it is a special parameter name (interpreted outside of ZSQLMethod).
Modified:
erp5/trunk/products/CMFActivity/Activity/SQLDict.py
erp5/trunk/products/CMFActivity/Activity/SQLQueue.py
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_reserveMessageList.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_selectReservedMessageList.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_reserveMessageList.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_selectReservedMessageList.zsql
Modified: erp5/trunk/products/CMFActivity/Activity/SQLDict.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLDict.py?rev=25253&r1=25252&r2=25253&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLDict.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLDict.py [utf8] Thu Jan 22 13:16:03 2009
@@ -161,10 +161,10 @@
This number is guaranted not to be exceeded.
If None (or not given) no limit apply.
"""
- result = activity_tool.SQLDict_selectReservedMessageList(processing_node=processing_node, limit=limit)
+ result = activity_tool.SQLDict_selectReservedMessageList(processing_node=processing_node, count=limit)
if len(result) == 0:
- activity_tool.SQLDict_reserveMessageList(limit=limit, processing_node=processing_node, to_date=date, **kw)
- result = activity_tool.SQLDict_selectReservedMessageList(processing_node=processing_node, limit=limit)
+ activity_tool.SQLDict_reserveMessageList(count=limit, processing_node=processing_node, to_date=date, **kw)
+ result = activity_tool.SQLDict_selectReservedMessageList(processing_node=processing_node, count=limit)
return result
def makeMessageListAvailable(self, activity_tool, uid_list):
Modified: erp5/trunk/products/CMFActivity/Activity/SQLQueue.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLQueue.py?rev=25253&r1=25252&r2=25253&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLQueue.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLQueue.py [utf8] Thu Jan 22 13:16:03 2009
@@ -110,10 +110,10 @@
This number is guaranted not to be exceeded.
If None (or not given) no limit apply.
"""
- result = activity_tool.SQLQueue_selectReservedMessageList(processing_node=processing_node, limit=limit)
+ result = activity_tool.SQLQueue_selectReservedMessageList(processing_node=processing_node, count=limit)
if len(result) == 0:
- activity_tool.SQLQueue_reserveMessageList(limit=limit, processing_node=processing_node, to_date=date)
- result = activity_tool.SQLQueue_selectReservedMessageList(processing_node=processing_node, limit=limit)
+ activity_tool.SQLQueue_reserveMessageList(count=limit, processing_node=processing_node, to_date=date)
+ result = activity_tool.SQLQueue_selectReservedMessageList(processing_node=processing_node, count=limit)
return result
def makeMessageListAvailable(self, activity_tool, uid_list):
@@ -482,7 +482,7 @@
now_date = self.getNow(activity_tool)
result = readMessageList(path=None, method_id=None, processing_node=-1,
to_date=now_date, include_processing=0,
- offset=offset, limit=READ_MESSAGE_LIMIT)
+ offset=offset, count=READ_MESSAGE_LIMIT)
validated_count = 0
#TIME_begin = time()
while len(result) and validated_count < MAX_VALIDATED_LIMIT:
@@ -503,7 +503,7 @@
offset += READ_MESSAGE_LIMIT
result = readMessageList(path=None, method_id=None, processing_node=-1,
to_date=now_date, include_processing=0,
- offset=offset, limit=READ_MESSAGE_LIMIT)
+ offset=offset, count=READ_MESSAGE_LIMIT)
#TIME_end = time()
#LOG('SQLQueue.distribute', INFO, '%0.4fs : %i messages => %i distributables' % (TIME_end - TIME_begin, offset + len(result), validated_count))
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_reserveMessageList.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_reserveMessageList.zsql?rev=25253&r1=25252&r2=25253&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_reserveMessageList.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_reserveMessageList.zsql [utf8] Thu Jan 22 13:16:03 2009
@@ -9,7 +9,7 @@
</dtml-comment>
<params>processing_node
to_date
-limit
+count
group_method_id
order_validation_text</params>
UPDATE
@@ -23,8 +23,8 @@
<dtml-if order_validation_text> AND order_validation_text = <dtml-sqlvar order_validation_text type="string"> </dtml-if>
ORDER BY
priority, date, uid
-<dtml-if limit>
- LIMIT <dtml-sqlvar limit type="int">
+<dtml-if count>
+ LIMIT <dtml-sqlvar count type="int">
</dtml-if>
<dtml-var sql_delimiter>
COMMIT
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_selectReservedMessageList.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_selectReservedMessageList.zsql?rev=25253&r1=25252&r2=25253&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_selectReservedMessageList.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_selectReservedMessageList.zsql [utf8] Thu Jan 22 13:16:03 2009
@@ -8,7 +8,7 @@
class_file:
</dtml-comment>
<params>processing_node
-limit</params>
+count</params>
SELECT
*
FROM
@@ -16,6 +16,6 @@
WHERE
processing_node = <dtml-sqlvar processing_node type="int">
AND processing = 0
-<dtml-if limit>
- LIMIT <dtml-sqlvar limit type="int">
+<dtml-if count>
+ LIMIT <dtml-sqlvar count type="int">
</dtml-if>
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_reserveMessageList.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_reserveMessageList.zsql?rev=25253&r1=25252&r2=25253&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_reserveMessageList.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_reserveMessageList.zsql [utf8] Thu Jan 22 13:16:03 2009
@@ -9,7 +9,7 @@
</dtml-comment>
<params>processing_node
to_date
-limit
+count
</params>
UPDATE
message_queue
@@ -20,8 +20,8 @@
AND date <= <dtml-sqlvar to_date type="datetime">
ORDER BY
priority, date, uid
-<dtml-if limit>
- LIMIT <dtml-sqlvar limit type="int">
+<dtml-if count>
+ LIMIT <dtml-sqlvar count type="int">
</dtml-if>
<dtml-var sql_delimiter>
COMMIT
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_selectReservedMessageList.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_selectReservedMessageList.zsql?rev=25253&r1=25252&r2=25253&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_selectReservedMessageList.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_selectReservedMessageList.zsql [utf8] Thu Jan 22 13:16:03 2009
@@ -8,7 +8,7 @@
class_file:
</dtml-comment>
<params>processing_node
-limit</params>
+count</params>
SELECT
*
FROM
@@ -16,6 +16,6 @@
WHERE
processing_node = <dtml-sqlvar processing_node type="int">
AND processing = 0
-<dtml-if limit>
- LIMIT <dtml-sqlvar limit type="int">
+<dtml-if count>
+ LIMIT <dtml-sqlvar count type="int">
</dtml-if>
More information about the Erp5-report
mailing list