[Erp5-report] r25037 - in /erp5/trunk/bt5/erp5_worklist_sql: SkinTemplateItem/portal_skins/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jan 8 11:09:58 CET 2009
Author: vincent
Date: Thu Jan 8 11:09:56 2009
New Revision: 25037
URL: http://svn.erp5.org?rev=25037&view=rev
Log:
New worklist cache behaviour to avoid problems when alarm and users were triggering a refresh in parallel:
- only the alarm can trigger a worklist refresh
- refreshing uses DELETE/INSERT instead of DROP/CREATE/INSERT.
Added:
erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zClearWorklistTable.xml
Modified:
erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_getCountFromWorklistTable.xml
erp5/trunk/bt5/erp5_worklist_sql/bt/revision
Modified: erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_getCountFromWorklistTable.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_getCountFromWorklistTable.xml?rev=25037&r1=25036&r2=25037&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_getCountFromWorklistTable.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_getCountFromWorklistTable.xml [utf8] Thu Jan 8 11:09:56 2009
@@ -53,27 +53,15 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>from ZODB.POSException import ConflictError\n
-# Wrapper for Base_zGetCountFromWorklistTable\n
+ <value> <string># Wrapper for Base_zGetCountFromWorklistTable\n
+\n
where_expression = query.asSQLExpression()[\'where_expression\']\n
-try:\n
- result = context.Base_zGetCountFromWorklistTable(\n
+\n
+return context.Base_zGetCountFromWorklistTable(\n
where_expression=where_expression,\n
select_expression=select_expression,\n
group_by_expression=group_by_expression,\n
**kw)\n
-except ConflictError:\n
- raise\n
-except:\n
- # Possibly a SQL error caused by a non-existing table.\n
- # Attemp a refresh and retry without error handling.\n
- context.Base_refreshWorklistTableContent()\n
- result = context.Base_zGetCountFromWorklistTable(\n
- where_expression=where_expression,\n
- select_expression=select_expression,\n
- group_by_expression=group_by_expression,\n
- **kw)\n
-return result\n
</string> </value>
</item>
<item>
@@ -114,14 +102,11 @@
<string>select_expression</string>
<string>group_by_expression</string>
<string>kw</string>
- <string>ZODB.POSException</string>
- <string>ConflictError</string>
<string>_getitem_</string>
<string>_getattr_</string>
<string>where_expression</string>
<string>_apply_</string>
<string>context</string>
- <string>result</string>
</tuple>
</value>
</item>
Added: erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zClearWorklistTable.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zClearWorklistTable.xml?rev=25037&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zClearWorklistTable.xml (added)
+++ erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zClearWorklistTable.xml [utf8] Thu Jan 8 11:09:56 2009
@@ -1,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_arg</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_data</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_keys</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>arguments_src</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>connection_id</string> </key>
+ <value> <string>erp5_sql_connection</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Base_zClearWorklistTable</string> </value>
+ </item>
+ <item>
+ <key> <string>src</string> </key>
+ <value> <string>DELETE FROM worklist_cache</string> </value>
+ </item>
+ <item>
+ <key> <string>template</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="__newobj__" module="copy_reg"/>
+ </klass>
+ <tuple>
+ <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>__name__</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<string>
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>_vars</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>globals</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>raw</string> </key>
+ <value> <string>DELETE FROM worklist_cache</string> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_worklist_sql/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_worklist_sql/bt/revision?rev=25037&r1=25036&r2=25037&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_worklist_sql/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_worklist_sql/bt/revision [utf8] Thu Jan 8 11:09:56 2009
@@ -1,1 +1,1 @@
-22
+24
More information about the Erp5-report
mailing list