[Erp5-report] r33849 daniele - in /erp5/trunk/bt5/erp5_dms: WorkflowTemplateItem/portal_wor...

[nobody at svn.erp5.org]

Author: daniele
Date: Thu Mar 18 10:48:39 2010
New Revision: 33849

URL: http://svn.erp5.org?rev=33849&view=rev
Log:
Fixed the priority some activities (convertToBaseFormat and updateBaseMetadata)
  for that the document is converted before to test that conversion has failed

Modified:
    erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/OOoDocument_updateMetadata.xml
    erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/upload.xml
    erp5/trunk/bt5/erp5_dms/bt/revision

Modified: erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/OOoDocument_updateMetadata.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/OOoDocument_updateMetadata.xml?rev=33849&r1=33848&r2=33849&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/OOoDocument_updateMetadata.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/OOoDocument_updateMetadata.xml [utf8] Thu Mar 18 10:48:39 2010
@@ -84,7 +84,8 @@
       new_metadata[metadata_key] = value\n
   if new_metadata:\n
     # edit metadata via server\n
-    document.activate().Document_tryToUpdateBaseMetadata(**new_metadata)\n
+    after_tag = \'document_%s_convert\' % document.getPath()\n
+    document.activate(after_tag=after_tag).Document_tryToUpdateBaseMetadata(**new_metadata)\n
 
 
 ]]></string> </value>
@@ -140,6 +141,7 @@
                             <string>str</string>
                             <string>metadata_key</string>
                             <string>_write_</string>
+                            <string>after_tag</string>
                             <string>_apply_</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/upload.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/upload.xml?rev=33849&r1=33848&r2=33849&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/upload.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/upload.xml [utf8] Thu Mar 18 10:48:39 2010
@@ -63,7 +63,8 @@
 if document.getParentValue().getPortalType() != \'Contribution Tool\' \\\n
    and document.isSupportBaseDataConversion():\n
   document.processFile()\n
-  document.activate().Document_tryToConvertToBaseFormat()\n
+  tag = \'document_%s_convert\' % document.getPath()\n
+  document.activate(tag=tag).Document_tryToConvertToBaseFormat()\n
 </string> </value>
         </item>
         <item>
@@ -104,6 +105,7 @@
                             <string>_getitem_</string>
                             <string>document</string>
                             <string>_getattr_</string>
+                            <string>tag</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=33849&r1=33848&r2=33849&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision [utf8] Thu Mar 18 10:48:39 2010
@@ -1,1 +1,1 @@
-1094
+1095