Small filter fixes
--HG-- branch : WINDOWSPORT
This commit is contained in:
@@ -199,7 +199,7 @@ class OXExtractor:
|
||||
|
||||
docdata += '</body></html>'
|
||||
|
||||
return (True, docdata, "", rclexecm.RclExecM.eofnow)
|
||||
return (True, docdata, "", rclexecm.RclExecM.eofnext)
|
||||
|
||||
|
||||
###### File type handler api, used by rclexecm ---------->
|
||||
|
||||
@@ -43,7 +43,7 @@ class PPTFilter:
|
||||
cmd = rclexecm.which("ppt-dump.py")
|
||||
if cmd:
|
||||
# ppt-dump.py often exits 1 with valid data. Ignore exit value
|
||||
return ([cmd, "--no-struct-output", "--dump-text"],
|
||||
return (["python", cmd, "--no-struct-output", "--dump-text"],
|
||||
PPTProcessData(self.em), rclexec1.Executor.opt_ignxval)
|
||||
else:
|
||||
return ([], None)
|
||||
|
||||
@@ -165,7 +165,7 @@ class OOExtractor:
|
||||
self.em.rclog("bad data in %s" % fn)
|
||||
return (False, "", "", rclexecm.RclExecM.eofnow)
|
||||
|
||||
return (True, docdata, "", rclexecm.RclExecM.eofnow)
|
||||
return (True, docdata, "", rclexecm.RclExecM.eofnext)
|
||||
|
||||
###### File type handler api, used by rclexecm ---------->
|
||||
def openfile(self, params):
|
||||
|
||||
@@ -49,7 +49,8 @@ class XLSFilter:
|
||||
cmd = rclexecm.which("xls-dump.py")
|
||||
if cmd:
|
||||
# xls-dump.py often exits 1 with valid data. Ignore exit value
|
||||
return ([cmd, "--dump-mode=canonical-xml", "--utf-8", "--catch"],
|
||||
return (["python", cmd, "--dump-mode=canonical-xml", \
|
||||
"--utf-8", "--catch"],
|
||||
XLSProcessData(self.em), rclexec1.Executor.opt_ignxval)
|
||||
else:
|
||||
return ([], None)
|
||||
|
||||
Reference in New Issue
Block a user