diff --git a/product/CMFActivity/skins/activity/SQLDict_readMessage.zsql b/product/CMFActivity/skins/activity/SQLDict_readMessage.zsql index 29254e6433feda889c0a4bebcf7fef9dfb55904d..07d275ac4eea4a67074d71fc0abbb67e68ef6a45 100644 --- a/product/CMFActivity/skins/activity/SQLDict_readMessage.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_readMessage.zsql @@ -16,7 +16,7 @@ order_validation_text</params> SELECT * FROM message WHERE - processing <> 1 + processing = 0 <dtml-if processing_node> 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 to_date>AND date <= <dtml-sqlvar to_date type="datetime"> </dtml-if> diff --git a/product/CMFActivity/skins/activity/SQLDict_readMessageList.zsql b/product/CMFActivity/skins/activity/SQLDict_readMessageList.zsql index 72ed310f45c7b3c9c80bad88c24cce3d135b212a..3c58a2e72074cb6d578707d40627b4a9bb2a027f 100644 --- a/product/CMFActivity/skins/activity/SQLDict_readMessageList.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_readMessageList.zsql @@ -18,7 +18,7 @@ SELECT * FROM WHERE 1 = 1 <dtml-if expr="not(include_processing)"> - AND processing <> 1 + AND processing = 0 </dtml-if> <dtml-if processing_node> AND processing_node = <dtml-sqlvar processing_node type="int"> </dtml-if> <dtml-if priority> AND priority = <dtml-sqlvar priority type="int"> </dtml-if> diff --git a/product/CMFActivity/skins/activity/SQLDict_readUidList.zsql b/product/CMFActivity/skins/activity/SQLDict_readUidList.zsql index d21b10b1b7d9dce263be204574aea4f43b4dd994..56e67c3c5872a8e090d4ebc9470d81ed94f2fdc0 100644 --- a/product/CMFActivity/skins/activity/SQLDict_readUidList.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_readUidList.zsql @@ -16,10 +16,10 @@ group_method_id</params> SELECT uid FROM message WHERE - processing <> 1 + processing = 0 <dtml-if processing_node> 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> \ No newline at end of file +<dtml-if group_method_id> AND group_method_id = <dtml-sqlvar group_method_id type="string"> </dtml-if> diff --git a/product/CMFActivity/skins/activity/SQLDict_writeMessage.zsql b/product/CMFActivity/skins/activity/SQLDict_writeMessage.zsql index 08eb0f24ca287541b09615be296c4542ff756d05..e0cea30820efe401f47ff09485d01f4cc5f8cf50 100644 --- a/product/CMFActivity/skins/activity/SQLDict_writeMessage.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_writeMessage.zsql @@ -25,7 +25,7 @@ SET <dtml-if date>date = <dtml-sqlvar date type="datetime">, <dtml-else>date = <dtml-sqlvar "_.DateTime()" type="datetime">, </dtml-if> method_id = <dtml-sqlvar method_id type="string">, processing_node = <dtml-sqlvar processing_node type="int">, - processing = -1, + processing = 0, priority = <dtml-sqlvar priority type="int">, broadcast = <dtml-sqlvar broadcast type="int">, group_method_id = <dtml-sqlvar group_method_id type="string">, diff --git a/product/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql b/product/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql index 8c308f6d4197b05cbc88e16dda5a355a9f9501ad..b50e069d39f6e4fa9b0a41442bd4e034793efca5 100644 --- a/product/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql @@ -29,7 +29,7 @@ VALUES <dtml-if date_list><dtml-sqlvar expr="date_list[loop_item]" type="datetime"><dtml-else><dtml-sqlvar "_.DateTime()" type="datetime"></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>, - -1, + 0, <dtml-sqlvar expr="priority_list[loop_item]" type="int">, <dtml-sqlvar expr="broadcast_list[loop_item]" type="int">, <dtml-sqlvar expr="group_method_id_list[loop_item]" type="string">, diff --git a/product/CMFActivity/skins/activity/SQLQueue_readMessage.zsql b/product/CMFActivity/skins/activity/SQLQueue_readMessage.zsql index 01685bb346b2746c865db214dbcc4e88431892e5..587134fc03c0c13ac27ffbd6939be4fd50e36795 100644 --- a/product/CMFActivity/skins/activity/SQLQueue_readMessage.zsql +++ b/product/CMFActivity/skins/activity/SQLQueue_readMessage.zsql @@ -13,7 +13,7 @@ to_date</params> SELECT * FROM message_queue WHERE - processing <> 1 + processing = 0 <dtml-if processing_node> 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 to_date> AND date <= <dtml-sqlvar to_date type="datetime"> </dtml-if> diff --git a/product/CMFActivity/skins/activity/SQLQueue_readMessageList.zsql b/product/CMFActivity/skins/activity/SQLQueue_readMessageList.zsql index d13fc826f959b52d16ea526ecf38b9fdcf9dd3dc..87c0beb8173dbf852d2287b05fa363a284ab48ac 100644 --- a/product/CMFActivity/skins/activity/SQLQueue_readMessageList.zsql +++ b/product/CMFActivity/skins/activity/SQLQueue_readMessageList.zsql @@ -15,7 +15,7 @@ to_date</params> SELECT * FROM message_queue WHERE - processing <> 1 + processing = 0 <dtml-if processing_node>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> diff --git a/product/CMFActivity/skins/activity/SQLQueue_readUidList.zsql b/product/CMFActivity/skins/activity/SQLQueue_readUidList.zsql index c12099e1165b38c251848827be9a0b4e65529576..03bc775891cf0423a17b63fc1e6bfb2b4b84b24b 100644 --- a/product/CMFActivity/skins/activity/SQLQueue_readUidList.zsql +++ b/product/CMFActivity/skins/activity/SQLQueue_readUidList.zsql @@ -14,7 +14,7 @@ to_date</params> SELECT uid FROM message_queue WHERE - processing <> 1 + processing = 0 <dtml-if processing_node> AND processing_node = <dtml-sqlvar processing_node type="int"></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> diff --git a/product/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql b/product/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql index 6872c897f42c4faf9c5696015bdfdb1908751c49..2b0c7791a0e84edb52df536c177585442aba2aed 100644 --- a/product/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql +++ b/product/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql @@ -26,7 +26,7 @@ SET processing_node = <dtml-sqlvar processing_node type="int">, </dtml-if> broadcast = <dtml-sqlvar broadcast type="int">, - processing = -1, + processing = 0, priority = <dtml-sqlvar priority type="int">, tag = <dtml-sqlvar tag type="string">, message = <dtml-sqlvar message type="string">