[Erp5-report] r25259 - /erp5/trunk/products/CMFActivity/skins/activity/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jan 22 14:05:35 CET 2009
Author: vincent
Date: Thu Jan 22 14:05:33 2009
New Revision: 25259
URL: http://svn.erp5.org?rev=25259&view=rev
Log:
Remove never passed parameters.
Modified:
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_assignMessage.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_hasMessage.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_readMessageList.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_readUidList.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_reserveMessageList.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_selectReservedMessageList.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_setPriority.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_timeShift.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_validateMessageList.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_assignMessage.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_hasMessage.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_readMessageList.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_reserveMessageList.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_selectReservedMessageList.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_setPriority.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_timeShift.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_validateMessageList.zsql
erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_writeMessageList.zsql
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_assignMessage.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_assignMessage.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_assignMessage.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_assignMessage.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -7,9 +7,8 @@
class_name:
class_file:
</dtml-comment>
-<params>path
+<params>
processing_node
-method_id
uid
</params>
UPDATE message
@@ -17,14 +16,8 @@
processing_node=<dtml-sqlvar processing_node type="int">,
processing=0
WHERE
-<dtml-if uid>
uid IN (
<dtml-in uid><dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>
)
-<dtml-else>
- processing_node = -1
- AND path = <dtml-sqlvar path type="string">
-<dtml-if method_id>AND method_id = <dtml-sqlvar method_id type="string"></dtml-if>
-</dtml-if>
<dtml-var sql_delimiter>
COMMIT
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_hasMessage.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_hasMessage.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_hasMessage.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_hasMessage.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -13,8 +13,7 @@
SELECT count(path) as message_count FROM
message
WHERE
-1 = 1
-<dtml-if path> AND path = <dtml-sqlvar path type="string"></dtml-if>
-<dtml-if method_id>AND method_id = <dtml-sqlvar method_id type="string"></dtml-if>
-<dtml-if only_valid>AND processing_node > -2</dtml-if>
+path = <dtml-sqlvar path type="string">
+<dtml-if expr="method_id is not None">AND method_id = <dtml-sqlvar method_id type="string"></dtml-if>
+<dtml-if expr="only_valid">AND processing_node > -2</dtml-if>
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_readMessageList.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_readMessageList.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_readMessageList.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_readMessageList.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -10,7 +10,6 @@
<params>path
method_id
processing_node
-priority
include_processing
to_date
offset:int=0
@@ -24,7 +23,6 @@
AND processing = 0
</dtml-if>
<dtml-if expr="processing_node is not None"> 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>
<dtml-if method_id> AND method_id = <dtml-sqlvar method_id type="string"> </dtml-if>
<dtml-if to_date> AND date <= <dtml-sqlvar to_date type="datetime"> </dtml-if>
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_readUidList.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_readUidList.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_readUidList.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_readUidList.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -7,19 +7,15 @@
class_name:
class_file:
</dtml-comment>
-<params>processing_node
+<params>
method_id
path
-to_date
order_validation_text
-group_method_id</params>
+</params>
SELECT uid FROM
message
WHERE
processing = 0
-<dtml-if expr="processing_node is not None"> AND processing_node = <dtml-sqlvar processing_node type="int"> </dtml-if>
<dtml-if method_id> AND method_id = <dtml-sqlvar method_id type="string"> </dtml-if>
<dtml-if path> AND path = <dtml-sqlvar path type="string"> </dtml-if>
-<dtml-if to_date> AND date <= <dtml-sqlvar to_date type="datetime"> </dtml-if>
<dtml-if order_validation_text> AND order_validation_text = <dtml-sqlvar order_validation_text type="string"> </dtml-if>
-<dtml-if group_method_id> AND group_method_id = <dtml-sqlvar group_method_id type="string"> </dtml-if>
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=25259&r1=25258&r2=25259&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 14:05:33 2009
@@ -11,7 +11,7 @@
to_date
count
group_method_id
-order_validation_text</params>
+</params>
UPDATE
message
SET
@@ -20,7 +20,6 @@
processing_node=0
AND date <= <dtml-sqlvar to_date type="datetime">
<dtml-if group_method_id> AND group_method_id = <dtml-sqlvar group_method_id type="string"> </dtml-if>
- <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 count>
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=25259&r1=25258&r2=25259&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 14:05:33 2009
@@ -16,6 +16,6 @@
WHERE
processing_node = <dtml-sqlvar processing_node type="int">
AND processing = 0
-<dtml-if count>
+<dtml-if expr="count is not None">
LIMIT <dtml-sqlvar count type="int">
</dtml-if>
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_setPriority.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_setPriority.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_setPriority.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_setPriority.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -9,11 +9,9 @@
</dtml-comment>
<params>uid:list
priority
-date
retry
delay
-processing_node
-order_validation_text</params>
+</params>
UPDATE
message
SET
@@ -23,22 +21,11 @@
</dtml-if>
<dtml-if delay>
, date = DATE_ADD(UTC_TIMESTAMP(), INTERVAL <dtml-sqlvar delay type="int"> * (retry + 1) SECOND)
-<dtml-elif date>
- , date = <dtml-sqlvar date type="datetime">
</dtml-if>
<dtml-if retry>
, retry = retry + <dtml-sqlvar retry type="int">
</dtml-if>
WHERE
- 1 = 1
-<dtml-if uid>
- AND uid IN (
+ uid IN (
<dtml-in uid><dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>
)
-</dtml-if>
-<dtml-if expr="_.getattr(_, 'processing_node', None) is not None">
- AND processing_node = <dtml-sqlvar processing_node type="int">
-</dtml-if>
-<dtml-if order_validation_text>
- AND order_validation_text = <dtml-sqlvar order_validation_text type="string">
-</dtml-if>
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_timeShift.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_timeShift.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_timeShift.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_timeShift.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -15,7 +15,7 @@
SET
date = DATE_SUB(date, INTERVAL <dtml-sqlvar delay type="int"> SECOND),
processing_date = DATE_SUB(processing_date, INTERVAL <dtml-sqlvar delay type="int"> SECOND)
-<dtml-if retry>
+<dtml-if expr="retry is not None">
,retry = GREATEST(retry,<dtml-sqlvar retry type="int">) - <dtml-sqlvar retry type="int">
</dtml-if>
WHERE
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_validateMessageList.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_validateMessageList.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_validateMessageList.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_validateMessageList.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -15,7 +15,7 @@
serialization_tag
</params>
SELECT
-<dtml-if count>
+<dtml-if expr="count">
COUNT(*) AS uid_count
<dtml-else>
*
@@ -24,23 +24,23 @@
message
WHERE
processing_node >= -2
-<dtml-if method_id>
+<dtml-if expr="method_id is not None">
AND method_id IN (
<dtml-in method_id><dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>
)
</dtml-if>
-<dtml-if message_uid>AND uid = <dtml-sqlvar message_uid type="int"> </dtml-if>
-<dtml-if path>
+<dtml-if expr="message_uid is not None">AND uid = <dtml-sqlvar message_uid type="int"> </dtml-if>
+<dtml-if expr="path is not None">
AND path IN (
<dtml-in path><dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>
)
</dtml-if>
-<dtml-if tag>
+<dtml-if expr="tag is not None">
AND tag IN (
<dtml-in tag><dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>
)
</dtml-if>
-<dtml-if serialization_tag>
+<dtml-if expr="serialization_tag is not None">
AND processing_node > -1
AND serialization_tag = <dtml-sqlvar serialization_tag type="string">
</dtml-if>
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -26,9 +26,9 @@
(
<dtml-sqlvar expr="uid_list[loop_item]" type="int">,
<dtml-sqlvar expr="path_list[loop_item]" type="string">,
- <dtml-if date_list><dtml-if expr="date_list[loop_item] is not None"><dtml-sqlvar expr="date_list[loop_item]" type="datetime"><dtml-else>UTC_TIMESTAMP()</dtml-if><dtml-else>UTC_TIMESTAMP()</dtml-if>,
+ <dtml-if expr="date_list is not None"><dtml-if expr="date_list[loop_item] is not None"><dtml-sqlvar expr="date_list[loop_item]" type="datetime"><dtml-else>UTC_TIMESTAMP()</dtml-if><dtml-else>UTC_TIMESTAMP()</dtml-if>,
<dtml-sqlvar expr="method_id_list[loop_item]" type="string">,
- <dtml-if processing_node_list><dtml-sqlvar expr="processing_node_list[loop_item]" type="int"><dtml-else>-1</dtml-if>,
+ <dtml-if expr="processing_node_list is not None"><dtml-sqlvar expr="processing_node_list[loop_item]" type="int"><dtml-else>-1</dtml-if>,
0,
<dtml-sqlvar expr="priority_list[loop_item]" type="int">,
<dtml-sqlvar expr="group_method_id_list[loop_item]" type="string">,
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_assignMessage.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_assignMessage.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_assignMessage.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_assignMessage.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -7,21 +7,16 @@
class_name:
class_file:
</dtml-comment>
-<params>path
+<params>
processing_node
-method_id
uid</params>
UPDATE message_queue
SET
processing_node=<dtml-sqlvar processing_node type="int">,
processing=0
WHERE
-<dtml-if path> path = <dtml-sqlvar path type="string">
-<dtml-else>
uid IN (
<dtml-in uid><dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>
)
-</dtml-if>
-<dtml-if method_id> AND method_id = <dtml-sqlvar method_id type="string"></dtml-if>
<dtml-var sql_delimiter>
COMMIT
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_hasMessage.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_hasMessage.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_hasMessage.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_hasMessage.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -13,8 +13,7 @@
SELECT count(path) as message_count FROM
message_queue
WHERE
-1 = 1
-<dtml-if path>AND path = <dtml-sqlvar path type="string"></dtml-if>
-<dtml-if method_id>AND method_id = <dtml-sqlvar method_id type="string"></dtml-if>
-<dtml-if only_valid>AND processing_node > -2</dtml-if>
+path = <dtml-sqlvar path type="string">
+<dtml-if expr="method_id is not None">AND method_id = <dtml-sqlvar method_id type="string"></dtml-if>
+<dtml-if expr="only_valid">AND processing_node > -2</dtml-if>
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_readMessageList.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_readMessageList.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_readMessageList.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_readMessageList.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -10,7 +10,6 @@
<params>path
method_id
processing_node
-priority
to_date
offset:int=0
count:int=1000
@@ -20,7 +19,6 @@
WHERE
processing = 0
<dtml-if expr="processing_node is not None"> 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>
<dtml-if method_id>AND method_id = <dtml-sqlvar method_id type="string"></dtml-if>
<dtml-if to_date> AND date <= <dtml-sqlvar to_date type="datetime"> </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=25259&r1=25258&r2=25259&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 14:05:33 2009
@@ -20,8 +20,6 @@
AND date <= <dtml-sqlvar to_date type="datetime">
ORDER BY
priority, date, uid
-<dtml-if count>
- LIMIT <dtml-sqlvar count type="int">
-</dtml-if>
+LIMIT <dtml-sqlvar count type="int">
<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=25259&r1=25258&r2=25259&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 14:05:33 2009
@@ -16,6 +16,6 @@
WHERE
processing_node = <dtml-sqlvar processing_node type="int">
AND processing = 0
-<dtml-if count>
+<dtml-if expr="count is not None">
LIMIT <dtml-sqlvar count type="int">
</dtml-if>
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_setPriority.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_setPriority.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_setPriority.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_setPriority.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -10,7 +10,7 @@
<params>uid
priority
delay
-date</params>
+</params>
UPDATE
message_queue
SET
@@ -20,8 +20,6 @@
</dtml-if>
<dtml-if delay>
, date = DATE_ADD(UTC_TIMESTAMP(), INTERVAL <dtml-sqlvar delay type="int"> SECOND)
- <dtml-elif date>
- , date = <dtml-sqlvar date type="datetime">
</dtml-if>
WHERE
uid IN (
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_timeShift.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_timeShift.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_timeShift.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_timeShift.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -12,8 +12,8 @@
UPDATE
message_queue
SET
- date = date - <dtml-sqlvar delay type="int">,
- processing_date = processing_date - <dtml-sqlvar delay type="int">
+ date = DATE_SUB(date, INTERVAL <dtml-sqlvar delay type="int"> SECOND),
+ processing_date = DATE_SUB(processing_date, INTERVAL <dtml-sqlvar delay type="int"> SECOND)
WHERE
1 = 1
<dtml-if expr="processing_node is not None">
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_validateMessageList.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_validateMessageList.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_validateMessageList.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_validateMessageList.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -15,7 +15,7 @@
serialization_tag
</params>
SELECT
-<dtml-if count>
+<dtml-if expr="count">
COUNT(*) AS uid_count
<dtml-else>
*
@@ -24,23 +24,23 @@
message_queue
WHERE
processing_node >= -2
-<dtml-if method_id>
+<dtml-if expr="method_id is not None">
AND method_id IN (
<dtml-in method_id><dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>
)
</dtml-if>
-<dtml-if message_uid>AND uid = <dtml-sqlvar message_uid type="int"> </dtml-if>
-<dtml-if path>
+<dtml-if expr="message_uid is not None">AND uid = <dtml-sqlvar message_uid type="int"> </dtml-if>
+<dtml-if expr="path is not None">
AND path IN (
<dtml-in path><dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>
)
</dtml-if>
-<dtml-if tag>
+<dtml-if expr="tag is not None">
AND tag IN (
<dtml-in tag><dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>
)
</dtml-if>
-<dtml-if serialization_tag>
+<dtml-if expr="serialization_tag is not None">
AND processing_node > -1
AND serialization_tag = <dtml-sqlvar serialization_tag type="string">
</dtml-if>
Modified: erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_writeMessageList.zsql
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_writeMessageList.zsql?rev=25259&r1=25258&r2=25259&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_writeMessageList.zsql [utf8] (original)
+++ erp5/trunk/products/CMFActivity/skins/activity/SQLQueue_writeMessageList.zsql [utf8] Thu Jan 22 14:05:33 2009
@@ -25,9 +25,9 @@
(
<dtml-sqlvar expr="uid_list[loop_item]" type="int">,
<dtml-sqlvar expr="path_list[loop_item]" type="string">,
- <dtml-if date_list><dtml-if expr="date_list[loop_item] is not None"><dtml-sqlvar expr="date_list[loop_item]" type="datetime"><dtml-else>UTC_TIMESTAMP()</dtml-if><dtml-else>UTC_TIMESTAMP()</dtml-if>,
+ <dtml-if expr="date_list is not None"><dtml-if expr="date_list[loop_item] is not None"><dtml-sqlvar expr="date_list[loop_item]" type="datetime"><dtml-else>UTC_TIMESTAMP()</dtml-if><dtml-else>UTC_TIMESTAMP()</dtml-if>,
<dtml-sqlvar expr="method_id_list[loop_item]" type="string">,
- <dtml-if processing_node_list><dtml-sqlvar expr="processing_node_list[loop_item]" type="int"><dtml-else>-1</dtml-if>,
+ <dtml-if expr="processing_node_list is not None"><dtml-sqlvar expr="processing_node_list[loop_item]" type="int"><dtml-else>-1</dtml-if>,
0,
<dtml-sqlvar expr="priority_list[loop_item]" type="int">,
<dtml-sqlvar expr="tag_list[loop_item]" type="string">,
More information about the Erp5-report
mailing list