[Erp5-report] r13952 - /erp5/trunk/products/ERP5/Document/PDFDocument.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Apr 5 09:29:13 CEST 2007
Author: jp
Date: Thu Apr 5 09:29:10 2007
New Revision: 13952
URL: http://svn.erp5.org?rev=13952&view=rev
Log:
Use _unpackData function instead of _unpackData method
Modified:
erp5/trunk/products/ERP5/Document/PDFDocument.py
Modified: erp5/trunk/products/ERP5/Document/PDFDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PDFDocument.py?rev=13952&r1=13951&r2=13952&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PDFDocument.py (original)
+++ erp5/trunk/products/ERP5/Document/PDFDocument.py Thu Apr 5 09:29:10 2007
@@ -25,16 +25,19 @@
#
##############################################################################
+import tempfile, os, cStringIO
+
from AccessControl import ClassSecurityInfo
from Products.CMFCore.WorkflowCore import WorkflowMethod
+from Products.CMFCore.utils import getToolByName
+
from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
from Products.ERP5Type.Cache import CachingMethod
from Products.ERP5.Document.Image import Image
from Products.ERP5.Document.Document import ConversionCacheMixin
-from Products.CMFCore.utils import getToolByName
+from Products.ERP5.Document.File import _unpackData
+
from zLOG import LOG
-
-import tempfile, os, cStringIO
class PDFDocument(Image, ConversionCacheMixin):
"""
@@ -75,7 +78,7 @@
"""
if format is None:
RESPONSE.setHeader('Content-Type', 'application/pdf')
- return self._unpackData(self.data)
+ return _unpackData(self.data)
if format in ('html', 'txt', 'text'):
mime, data = self.convert(format)
RESPONSE.setHeader('Content-Length', len(data))
@@ -119,7 +122,7 @@
Convert the PDF text content to text with pdftotext
"""
tmp = tempfile.NamedTemporaryFile()
- tmp.write(self._unpackData(self.data))
+ tmp.write(_unpackData(self.data))
tmp.seek(0)
cmd = 'pdftotext -layout -enc UTF-8 -nopgbrk %s -' % tmp.name
r = os.popen(cmd)
@@ -137,7 +140,7 @@
successfully
"""
tmp = tempfile.NamedTemporaryFile()
- tmp.write(self._unpackData(self.data))
+ tmp.write(_unpackData(self.data))
tmp.seek(0)
cmd = 'pdftohtml -enc UTF-8 -stdout -noframes -i %s' % tmp.name
r = os.popen(cmd)
@@ -157,7 +160,7 @@
successfully
"""
tmp = tempfile.NamedTemporaryFile()
- tmp.write(self._unpackData(self.data))
+ tmp.write(_unpackData(self.data))
tmp.seek(0)
cmd = 'pdfinfo -meta -box %s' % tmp.name
r = os.popen(cmd)
More information about the Erp5-report
mailing list