[Erp5-report] r35390 ivan - in /erp5/trunk/bt5/erp5_ingestion: SkinTemplateItem/portal_skin...

[nobody at svn.erp5.org]

Author: ivan
Date: Mon May 17 14:47:33 2010
New Revision: 35390

URL: http://svn.erp5.org?rev=35390&view=rev
Log:
Use existing API to check if converting to base format is supported or not (rather than relying on dynamic method introspection).

Modified:
    erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convertToBaseFormatAndDiscoverMetadata.xml
    erp5/trunk/bt5/erp5_ingestion/bt/revision

Modified: erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convertToBaseFormatAndDiscoverMetadata.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convertToBaseFormatAndDiscoverMetadata.xml?rev=35390&r1=35389&r2=35390&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convertToBaseFormatAndDiscoverMetadata.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convertToBaseFormatAndDiscoverMetadata.xml [utf8] Mon May 17 14:47:33 2010
@@ -54,14 +54,14 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>"""\n
-This is a convenient method to call both convertToBaseFormat and\n
-discoverMetadata in good order in the same transaction. This method\n
-guarantees order of calling methods. convertToBaseFormat is called first,\n
-and discoverMetadata is called after.\n
+  This is a convenient method to call both convertToBaseFormat and\n
+  discoverMetadata in good order in the same transaction. \n
+  This method guarantees order of calling methods.\n
 """\n
-convertToBaseFormat = getattr(context, \'convertToBaseFormat\', None)\n
-if convertToBaseFormat is not None:\n
-  convertToBaseFormat()\n
+\n
+if context.isSupportBaseDataConversion():\n
+  context.convertToBaseFormat()\n
+\n
 return context.discoverMetadata(file_name, user_login)\n
 </string> </value>
         </item>
@@ -101,11 +101,8 @@
                           <tuple>
                             <string>file_name</string>
                             <string>user_login</string>
-                            <string>getattr</string>
+                            <string>_getattr_</string>
                             <string>context</string>
-                            <string>None</string>
-                            <string>convertToBaseFormat</string>
-                            <string>_getattr_</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_ingestion/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/bt/revision?rev=35390&r1=35389&r2=35390&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] Mon May 17 14:47:33 2010
@@ -1,1 +1,1 @@
-93
+94