[Erp5-report] r29850 - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/erp5_dms/...

[nobody at svn.erp5.org]

Author: ivan
Date: Tue Oct 20 14:31:48 2009
New Revision: 29850

URL: http://svn.erp5.org?rev=29850&view=rev
Log:
Try to convert only if not already converted.

Modified:
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml
    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=29850&r1=29849&r2=29850&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] Tue Oct 20 14:31:48 2009
@@ -59,25 +59,28 @@
 from socket import error as SocketError\n
 \n
 message = None\n
-try:\n
-  return context.convertToBaseFormat()\n
-except ConflictError:\n
-  raise\n
-except ConversionError, e:\n
-  message = \'Conversion Error: %s\' % (str(e) or \'undefined.\')\n
-except Fault, e:\n
-  message = \'XMLFault: %s\' % (repr(e) or \'undefined.\')\n
-except SocketError, e:\n
-  message = \'Socket Error: %s\' % (repr(e) or \'undefined.\')\n
-except Exception, e:\n
-  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.processFile(comment=message)\n
-# try again.\n
-context.activate(priority=3).convertToBaseFormat()\n
+if context.getExternalProcessingState()!=\'converted\':\n
+  # try to convert to base format only if not already done\n
+  try:\n
+    return context.convertToBaseFormat()\n
+  except ConflictError:\n
+    raise\n
+  except ConversionError, e:\n
+    message = \'Conversion Error: %s\' % (str(e) or \'undefined.\')\n
+  except Fault, e:\n
+    message = \'XMLFault: %s\' % (repr(e) or \'undefined.\')\n
+  except SocketError, e:\n
+    message = \'Socket Error: %s\' % (repr(e) or \'undefined.\')\n
+  except Exception, e:\n
+    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
 return message\n
 </string> </value>
         </item>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=29850&r1=29849&r2=29850&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision [utf8] Tue Oct 20 14:31:48 2009
@@ -1,1 +1,1 @@
-1043
+1044