[Erp5-report] r33688 ivan - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/erp5...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Mar 12 10:31:31 CET 2010
Author: ivan
Date: Fri Mar 12 10:31:30 2010
New Revision: 33688
URL: http://svn.erp5.org?rev=33688&view=rev
Log:
Add conversion_failed state (indicating an external OOOd failure) and needed transitions.
Fix respective scripts to change to that state rather than add another low priority activity (which is likely to fail again).
When in this state (conversion_failed) user has a chance to act accordingly in some use cases (bad file upload)
Added:
erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/conversion_failed.xml
erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/conversion_failed.xml
erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/process_conversion_failed.xml
Modified:
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml
erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/converting.xml
erp5/trunk/bt5/erp5_dms/bt/change_log
erp5/trunk/bt5/erp5_dms/bt/revision
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml?rev=33688&r1=33687&r2=33688&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml [utf8] Fri Mar 12 10:31:30 2010
@@ -54,6 +54,7 @@
<item>
<key> <string>_body</string> </key>
<value> <string>from Products.ERP5.Document.Document import ConversionError\n
+from Products.ERP5Type.Log import log\n
from ZODB.POSException import ConflictError\n
from xmlrpclib import Fault\n
from socket import error as SocketError\n
@@ -75,12 +76,11 @@
message = \'Problem: %s\' % (repr(e) or \'undefined.\')\n
except:\n
message = \'Problem: unknown\'\n
-\n
- # reach here, then exception was raised.\n
- # message must be logged in workflow.\n
- context.processFile(comment=message)\n
- # try again.\n
- context.activate(priority=3).convertToBaseFormat()\n
+ # reach here, then exception was raised, message must be logged in workflow\n
+ # do not simply raise but rather change external processing state\n
+ # so user will see something is wrong \n
+ context.conversionFailed(comment=message)\n
+ log(\'%s %s\' %(context.getRelativeUrl(), message))\n
return message\n
</string> </value>
</item>
@@ -128,6 +128,8 @@
<tuple>
<string>Products.ERP5.Document.Document</string>
<string>ConversionError</string>
+ <string>Products.ERP5Type.Log</string>
+ <string>log</string>
<string>ZODB.POSException</string>
<string>ConflictError</string>
<string>xmlrpclib</string>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml?rev=33688&r1=33687&r2=33688&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml [utf8] Fri Mar 12 10:31:30 2010
@@ -55,6 +55,7 @@
<key> <string>_body</string> </key>
<value> <string>from ZODB.POSException import ConflictError\n
from Products.ERP5.Document.Document import ConversionError\n
+from Products.ERP5Type.Log import log\n
\n
message = None\n
try:\n
@@ -67,11 +68,19 @@
message = \'Problem: %s\' % (repr(e) or \'undefined.\')\n
except:\n
message = \'Problem: unknown\'\n
-# reach here, then exception was raised.\n
-# message must be logged in workflow.\n
-context.updateFileMetadata(comment=message)\n
-# try again\n
-context.activate(priority=3).updateBaseMetadata(**kw)\n
+\n
+# reach here, then exception was raised, message must be logged in workflow\n
+# do not simply raise but rather change external processing state\n
+# so user will see something is wrong. As usually updateBaseMetadata is called\n
+# after convertToBaseFormat it\'s possible that object is in conversion failed state \n
+isTransitionPossible = context.getPortalObject().portal_workflow.isTransitionPossible\n
+if isTransitionPossible(context, \'conversion_failed\'):\n
+ # mark document as conversion failed if not already done by convertToBaseFormat\n
+ context.conversionFailed(comment=message)\n
+else:\n
+ # just save problem message in workflow history\n
+ context.processConversionFailed(comment=message)\n
+log(\'%s %s\' %(context.getRelativeUrl(), message))\n
return message\n
</string> </value>
</item>
@@ -114,6 +123,8 @@
<string>ConflictError</string>
<string>Products.ERP5.Document.Document</string>
<string>ConversionError</string>
+ <string>Products.ERP5Type.Log</string>
+ <string>log</string>
<string>None</string>
<string>message</string>
<string>_apply_</string>
@@ -123,6 +134,7 @@
<string>str</string>
<string>Exception</string>
<string>repr</string>
+ <string>isTransitionPossible</string>
</tuple>
</value>
</item>
Added: erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/conversion_failed.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/conversion_failed.xml?rev=33688&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/conversion_failed.xml (added)
+++ erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/conversion_failed.xml [utf8] Fri Mar 12 10:31:30 2010
@@ -1,0 +1,43 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>Conversion process failed from some reason</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>conversion_failed</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Conversion Failed</string> </value>
+ </item>
+ <item>
+ <key> <string>transitions</string> </key>
+ <value>
+ <tuple>
+ <string>convert_action</string>
+ <string>process_conversion_failed</string>
+ <string>process_file</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>type_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/converting.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/converting.xml?rev=33688&r1=33687&r2=33688&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/converting.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/converting.xml [utf8] Fri Mar 12 10:31:30 2010
@@ -25,6 +25,7 @@
<key> <string>transitions</string> </key>
<value>
<tuple>
+ <string>conversion_failed</string>
<string>convert_action</string>
<string>convert_file</string>
<string>process_file</string>
Added: erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/conversion_failed.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/conversion_failed.xml?rev=33688&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/conversion_failed.xml (added)
+++ erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/conversion_failed.xml [utf8] Fri Mar 12 10:31:30 2010
@@ -1,0 +1,61 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>actbox_category</string> </key>
+ <value> <string>workflow</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>after_script_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>guard</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>conversion_failed</string> </value>
+ </item>
+ <item>
+ <key> <string>new_state_id</string> </key>
+ <value> <string>conversion_failed</string> </value>
+ </item>
+ <item>
+ <key> <string>script_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>trigger_type</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/process_conversion_failed.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/process_conversion_failed.xml?rev=33688&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/process_conversion_failed.xml (added)
+++ erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/process_conversion_failed.xml [utf8] Fri Mar 12 10:31:30 2010
@@ -1,0 +1,61 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>actbox_category</string> </key>
+ <value> <string>workflow</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>after_script_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>guard</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>process_conversion_failed</string> </value>
+ </item>
+ <item>
+ <key> <string>new_state_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>script_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>trigger_type</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_dms/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/change_log?rev=33688&r1=33687&r2=33688&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/bt/change_log [utf8] Fri Mar 12 10:31:30 2010
@@ -1,3 +1,6 @@
+2010-03-12 ivan
+* Add conversion_failed state (indicating an external OOOd failure) and needed transitions.
+
2010-02-12 ivan
* Add new interaction that will add contributor (logged in user) to edited document
Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=33688&r1=33687&r2=33688&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision [utf8] Fri Mar 12 10:31:30 2010
@@ -1,1 +1,1 @@
-1092
+1093
More information about the Erp5-report
mailing list