From 3a5be1e731ff558c20c6a437226ab2c37b08b493 Mon Sep 17 00:00:00 2001 From: Nicolas Dumazet <nicolas.dumazet@nexedi.com> Date: Fri, 9 Oct 2009 09:54:18 +0000 Subject: [PATCH] Move ERP5Type/patches/transforms to PortalTransforms/transforms git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29512 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../ToolTemplateItem/portal_transforms.xml | 4 +- product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- .../ERP5Type/patches/transforms/__init__.py | 4 -- .../patches/transforms/html_to_text.py | 53 ------------------- .../PortalTransforms/transforms/__init__.py | 2 + .../transforms/html_to_text.py | 4 ++ .../transforms/png_to_text.py | 0 .../transforms/w3m_dump.py | 0 8 files changed, 9 insertions(+), 60 deletions(-) delete mode 100644 product/ERP5Type/patches/transforms/__init__.py delete mode 100644 product/ERP5Type/patches/transforms/html_to_text.py rename product/{ERP5Type/patches => PortalTransforms}/transforms/png_to_text.py (100%) rename product/{ERP5Type/patches => PortalTransforms}/transforms/w3m_dump.py (100%) diff --git a/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml b/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml index fd0cdec70a..608c4e58b8 100644 --- a/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml +++ b/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml @@ -14650,7 +14650,7 @@ </item> <item> <key> <string>module</string> </key> - <value> <string>Products.ERP5Type.patches.transforms.png_to_text</string> </value> + <value> <string>Products.PortalTransforms.transforms.png_to_text</string> </value> </item> <item> <key> <string>output</string> </key> @@ -15171,7 +15171,7 @@ </item> <item> <key> <string>module</string> </key> - <value> <string>Products.ERP5Type.patches.transforms.w3m_dump</string> </value> + <value> <string>Products.PortalTransforms.transforms.w3m_dump</string> </value> </item> <item> <key> <string>output</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 41f48e56e4..2d14433bf8 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -1325 +1326 diff --git a/product/ERP5Type/patches/transforms/__init__.py b/product/ERP5Type/patches/transforms/__init__.py deleted file mode 100644 index dead065cb9..0000000000 --- a/product/ERP5Type/patches/transforms/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# This package contains transforms for PortalTransforms. -# It does not have to be imported by ZopePatch, instead, erp5_crm business -# template contains a portal_transform configured to use thoses transforms. - diff --git a/product/ERP5Type/patches/transforms/html_to_text.py b/product/ERP5Type/patches/transforms/html_to_text.py deleted file mode 100644 index 5df39e9085..0000000000 --- a/product/ERP5Type/patches/transforms/html_to_text.py +++ /dev/null @@ -1,53 +0,0 @@ -# This is taken from PortalTransforms product -# -# Copyright (c) 2002-2003, Benjamin Saller <bcsaller@ideasuite.com>, and -# the respective authors. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Archetypes nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - - -from Products.PortalTransforms.libtransforms.retransform import retransform - -class html_to_text(retransform): - inputs = ('text/html',) - output = 'text/plain' - -def register(): - # XXX convert entites with htmlentitydefs.name2codepoint ? - return html_to_text("html_to_text", - ('<script [^>]>.*</script>(?im)', ''), - ('<style [^>]>.*</style>(?im)', ''), - ('<head [^>]>.*</head>(?im)', ''), - - # added for ERP5, we want to transform <br/> in newlines - ('<br\s*/?>(?im)', '\n'), - - ('(?im)<(h[1-6r]|address|p|ul|ol|dl|pre|div|center|blockquote|form|isindex|table)(?=\W)[^>]*>', ' '), - ('<[^>]*>(?i)(?m)', ''), - ) diff --git a/product/PortalTransforms/transforms/__init__.py b/product/PortalTransforms/transforms/__init__.py index 22022cc322..4d7b098de8 100644 --- a/product/PortalTransforms/transforms/__init__.py +++ b/product/PortalTransforms/transforms/__init__.py @@ -23,6 +23,7 @@ modules = [ 'html_to_text', # re based transform 'text_to_html', # wrap text in a verbatim env 'text_pre_to_html', # wrap text into a pre + 'png_to_text', 'pdf_to_html', # sf.net/projects/pdftohtml 'pdf_to_text', # www.foolabs.com/xpdf 'rtf_to_html', # sf.net/projects/rtf-converter @@ -35,6 +36,7 @@ modules = [ 'image_to_tiff', # transforms any image to a TIFF image 'image_to_bmp', # transforms any image to a BMP image 'lynx_dump', # lynx -dump + 'w3m dump', 'python', # python source files, no dependancies 'identity', # identity transform, no dependancies ] diff --git a/product/PortalTransforms/transforms/html_to_text.py b/product/PortalTransforms/transforms/html_to_text.py index 2a26c56bcb..ccaa60b84c 100644 --- a/product/PortalTransforms/transforms/html_to_text.py +++ b/product/PortalTransforms/transforms/html_to_text.py @@ -10,6 +10,10 @@ def register(): ('<script [^>]>.*</script>(?im)', ''), ('<style [^>]>.*</style>(?im)', ''), ('<head [^>]>.*</head>(?im)', ''), + + # added for ERP5, we want to transform <br/> in newlines + ('<br\s*/?>(?im)', '\n'), + ('(?im)<(h[1-6r]|address|p|ul|ol|dl|pre|div|center|blockquote|form|isindex|table)(?=\W)[^>]*>', ' '), ('<[^>]*>(?i)(?m)', ''), ) diff --git a/product/ERP5Type/patches/transforms/png_to_text.py b/product/PortalTransforms/transforms/png_to_text.py similarity index 100% rename from product/ERP5Type/patches/transforms/png_to_text.py rename to product/PortalTransforms/transforms/png_to_text.py diff --git a/product/ERP5Type/patches/transforms/w3m_dump.py b/product/PortalTransforms/transforms/w3m_dump.py similarity index 100% rename from product/ERP5Type/patches/transforms/w3m_dump.py rename to product/PortalTransforms/transforms/w3m_dump.py -- 2.30.9