From 2807d72380538d365ea4b956a9d622b013171719 Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Mon, 17 May 2010 12:47:33 +0000 Subject: [PATCH] Use existing API to check if converting to base format is supported or not (rather than relying on dynamic method introspection). git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35390 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...convertToBaseFormatAndDiscoverMetadata.xml | 19 ++++++++----------- bt5/erp5_ingestion/bt/revision | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convertToBaseFormatAndDiscoverMetadata.xml b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convertToBaseFormatAndDiscoverMetadata.xml index c2cece1e13..c81df5fa45 100644 --- a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convertToBaseFormatAndDiscoverMetadata.xml +++ b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convertToBaseFormatAndDiscoverMetadata.xml @@ -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 @@ return context.discoverMetadata(file_name, user_login)\n <tuple> <string>file_name</string> <string>user_login</string> - <string>getattr</string> - <string>context</string> - <string>None</string> - <string>convertToBaseFormat</string> <string>_getattr_</string> + <string>context</string> </tuple> </value> </item> diff --git a/bt5/erp5_ingestion/bt/revision b/bt5/erp5_ingestion/bt/revision index 27a37eb577..bd753ccc4b 100644 --- a/bt5/erp5_ingestion/bt/revision +++ b/bt5/erp5_ingestion/bt/revision @@ -1 +1 @@ -93 \ No newline at end of file +94 \ No newline at end of file -- 2.30.9