tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small filter fixes

Browse Source 
--HG--
branch : WINDOWSPORT
This commit is contained in:
Jean-Francois Dockes 2015-09-14 14:19:23 +02:00
parent 7337e5a9ff
commit 031a2a0b4a
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/filters/rclopxml.py
View File

@ -199,7 +199,7 @@ class OXExtractor:
docdata += '</body></html>' docdata += '</body></html>'
return (True, docdata, "", rclexecm.RclExecM.eofnow) return (True, docdata, "", rclexecm.RclExecM.eofnext)
###### File type handler api, used by rclexecm ----------> ###### File type handler api, used by rclexecm ---------->

2
src/filters/rclppt.py
View File

@ -43,7 +43,7 @@ class PPTFilter:
cmd = rclexecm.which("ppt-dump.py") cmd = rclexecm.which("ppt-dump.py")
if cmd: if cmd:
# ppt-dump.py often exits 1 with valid data. Ignore exit value # 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) PPTProcessData(self.em), rclexec1.Executor.opt_ignxval)
else: else:
return ([], None) return ([], None)

2
src/filters/rclsoff.py
View File

@ -165,7 +165,7 @@ class OOExtractor:
self.em.rclog("bad data in %s" % fn) self.em.rclog("bad data in %s" % fn)
return (False, "", "", rclexecm.RclExecM.eofnow) return (False, "", "", rclexecm.RclExecM.eofnow)
return (True, docdata, "", rclexecm.RclExecM.eofnow) return (True, docdata, "", rclexecm.RclExecM.eofnext)
###### File type handler api, used by rclexecm ----------> ###### File type handler api, used by rclexecm ---------->
def openfile(self, params): def openfile(self, params):

3
src/filters/rclxls.py
View File

@ -49,7 +49,8 @@ class XLSFilter:
cmd = rclexecm.which("xls-dump.py") cmd = rclexecm.which("xls-dump.py")
if cmd: if cmd:
# xls-dump.py often exits 1 with valid data. Ignore exit value # 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) XLSProcessData(self.em), rclexec1.Executor.opt_ignxval)
else: else:
return ([], None) return ([], None)

5
src/internfile/mimehandler.cpp
View File

@ -222,10 +222,10 @@ MimeHandlerExec *mhExecFactory(RclConfig *cfg, const string& mtype, string& hs,
new MimeHandlerExec(cfg, id); new MimeHandlerExec(cfg, id);
vector<string>::iterator it = cmdtoks.begin(); vector<string>::iterator it = cmdtoks.begin();
#ifdef _WIN32
// Special-case python and perl on windows: we need to also locate the // Special-case python and perl on windows: we need to also locate the
// first argument which is the script name "python somescript.py". // first argument which is the script name "python somescript.py".
// On Unix, thanks to #!, we just run "somescript.py" // On Unix, thanks to #!, we usually just run "somescript.py", but need
// the same change if we ever want to use the same cmdling as windows
if (!stringlowercmp("python", *it) || !stringlowercmp("perl", *it)) { if (!stringlowercmp("python", *it) || !stringlowercmp("perl", *it)) {
if (cmdtoks.size() < 2) { if (cmdtoks.size() < 2) {
LOGERR(("mhExecFactory: python/perl cmd: no script?. [%s]: [%s]\n", LOGERR(("mhExecFactory: python/perl cmd: no script?. [%s]: [%s]\n",
@ -235,7 +235,6 @@ MimeHandlerExec *mhExecFactory(RclConfig *cfg, const string& mtype, string& hs,
it1++; it1++;
*it1 = cfg->findFilter(*it1); *it1 = cfg->findFilter(*it1);
} }
#endif
h->params.push_back(cfg->findFilter(*it++)); h->params.push_back(cfg->findFilter(*it++));
h->params.insert(h->params.end(), it, cmdtoks.end()); h->params.insert(h->params.end(), it, cmdtoks.end());