[Erp5-report] r29512 - in /erp5/trunk/products: ERP5/bootstrap/erp5_core/ToolTemplateItem/ ...

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Fri Oct  9 11:54:18 2009
New Revision: 29512

URL: http://svn.erp5.org?rev=29512&view=rev
Log:
Move ERP5Type/patches/transforms to PortalTransforms/transforms

Added:
    erp5/trunk/products/PortalTransforms/transforms/png_to_text.py   (props changed)
      - copied unchanged from r29506, erp5/trunk/products/ERP5Type/patches/transforms/png_to_text.py
    erp5/trunk/products/PortalTransforms/transforms/w3m_dump.py   (props changed)
      - copied unchanged from r29506, erp5/trunk/products/ERP5Type/patches/transforms/w3m_dump.py
Removed:
    erp5/trunk/products/ERP5Type/patches/transforms/
Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
    erp5/trunk/products/PortalTransforms/transforms/__init__.py
    erp5/trunk/products/PortalTransforms/transforms/html_to_text.py

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml?rev=29512&r1=29511&r2=29512&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml [utf8] Fri Oct  9 11:54:18 2009
@@ -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>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=29512&r1=29511&r2=29512&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Fri Oct  9 11:54:18 2009
@@ -1,1 +1,1 @@
-1325
+1326

Modified: erp5/trunk/products/PortalTransforms/transforms/__init__.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/transforms/__init__.py?rev=29512&r1=29511&r2=29512&view=diff
==============================================================================
--- erp5/trunk/products/PortalTransforms/transforms/__init__.py [utf8] (original)
+++ erp5/trunk/products/PortalTransforms/transforms/__init__.py [utf8] Fri Oct  9 11:54:18 2009
@@ -23,6 +23,7 @@
     '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 @@
     '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
     ]

Modified: erp5/trunk/products/PortalTransforms/transforms/html_to_text.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/transforms/html_to_text.py?rev=29512&r1=29511&r2=29512&view=diff
==============================================================================
--- erp5/trunk/products/PortalTransforms/transforms/html_to_text.py [utf8] (original)
+++ erp5/trunk/products/PortalTransforms/transforms/html_to_text.py [utf8] Fri Oct  9 11:54:18 2009
@@ -10,6 +10,10 @@
                        ('<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)', ''),
                        )

Propchange: erp5/trunk/products/PortalTransforms/transforms/png_to_text.py
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: erp5/trunk/products/PortalTransforms/transforms/w3m_dump.py
------------------------------------------------------------------------------
    svn:mergeinfo =