From 0db7cfc9a86dee27f9205f6df65feffa732eae4f Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Fri, 7 Jan 2011 16:40:50 +0000 Subject: [PATCH] Also support data parameter instead only file id git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42126 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../ConfigurationTemplate_readOOoCalcFile.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_configurator/ExtensionTemplateItem/ConfigurationTemplate_readOOoCalcFile.py b/bt5/erp5_configurator/ExtensionTemplateItem/ConfigurationTemplate_readOOoCalcFile.py index 4a5711720e..3b5349b509 100644 --- a/bt5/erp5_configurator/ExtensionTemplateItem/ConfigurationTemplate_readOOoCalcFile.py +++ b/bt5/erp5_configurator/ExtensionTemplateItem/ConfigurationTemplate_readOOoCalcFile.py @@ -27,14 +27,20 @@ # ############################################################################## +# This extension should be replaced by a clever parser provided by +# ERP5OOo or probably by CloudOOo itself. + import StringIO -def read(self, filename): +def read(self, filename, data): """ Return a OOCalc as a StringIO """ - oo_template_file = getattr(self, filename) - fp = StringIO.StringIO(oo_template_file) + if data is None: + oo_template_file = getattr(self, filename) + fp = StringIO.StringIO(oo_template_file) + else: + fp = StringIO.StringIO(data) fp.filename = filename return fp @@ -67,10 +73,10 @@ def getIdFromString(string): break return clean_id -def convert(self, filename): +def convert(self, filename, data=None): from Products.ERP5OOo.OOoUtils import OOoParser OOoParser = OOoParser() - import_file = read(self, filename) + import_file = read(self, filename, data) # Extract tables from the speadsheet file OOoParser.openFile(import_file) -- 2.30.9