[FIX] Document: Does no longer generate an error when trying to send a quotation by email when pdftotext is not available. This case is handled more gracefully (a warning in the log). Also changes the default return when generating the index using antiword to be more consistent.
lp bug: https://launchpad.net/bugs/1094423 fixed bzr revid: cbi@openerp.com-20130307085505-v9vwo788ios8244u
This commit is contained in:
parent
98c5322de9
commit
2a8d7548f7
|
@ -181,11 +181,11 @@ class contentIndex(object):
|
|||
res = (mime, fobj.indexContent(content,filename,fname or realfname) )
|
||||
else:
|
||||
_logger.debug("Have no object, return (%s, None).", mime)
|
||||
res = (mime, None )
|
||||
res = (mime, '')
|
||||
except Exception:
|
||||
_logger.exception("Cannot index file %s (%s).",
|
||||
filename, fname or realfname)
|
||||
res = None
|
||||
res = (mime, '')
|
||||
|
||||
# If we created a tmp file, unlink it now
|
||||
if not realfname and fname:
|
||||
|
|
|
@ -105,7 +105,7 @@ class DocIndex(indexer):
|
|||
|
||||
_logger.warning("Failed attempt to execute antiword (MS Word reader). Antiword is necessary to index the file %s of MIME type %s. Detailed error available at DEBUG level.", fname, self._getMimeTypes()[0])
|
||||
_logger.debug("Trace of the failed file indexing attempt.", exc_info=True)
|
||||
return False
|
||||
return u''
|
||||
|
||||
cntIndex.register(DocIndex())
|
||||
|
||||
|
@ -166,9 +166,14 @@ class PdfIndex(indexer):
|
|||
return ['.pdf']
|
||||
|
||||
def _doIndexFile(self, fname):
|
||||
try:
|
||||
pop = Popen(['pdftotext', '-enc', 'UTF-8', '-nopgbrk', fname, '-'], shell=False, stdout=PIPE)
|
||||
(data, _) = pop.communicate()
|
||||
return _to_unicode(data)
|
||||
except OSError:
|
||||
_logger.warning("Failed attempt to execute pdftotext. This program is necessary to index the file %s of MIME type %s. Detailed error available at DEBUG level.", fname, self._getMimeTypes()[0])
|
||||
_logger.debug("Trace of the failed file indexing attempt.", exc_info=True)
|
||||
return u''
|
||||
|
||||
cntIndex.register(PdfIndex())
|
||||
|
||||
|
|
Loading…
Reference in New Issue