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

windows: arrange so that we can use simple python script names in mimeconf

Browse Source 
--HG--
branch : WINDOWSPORT
This commit is contained in:
Jean-Francois Dockes 2015-09-12 16:18:05 +02:00
parent 118982d25e
commit 82bdf21833
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/internfile/mimehandler.cpp
View File

@ -205,7 +205,7 @@ MimeHandlerExec *mhExecFactory(RclConfig *cfg, const string& mtype, string& hs,
} }
// Split command name and args, and build exec object // Split command name and args, and build exec object
list<string> cmdtoks; vector<string> cmdtoks;
stringToStrings(cmdstr, cmdtoks); stringToStrings(cmdstr, cmdtoks);
if (cmdtoks.empty()) { if (cmdtoks.empty()) {
LOGERR(("mhExecFactory: bad config line for [%s]: [%s]\n", LOGERR(("mhExecFactory: bad config line for [%s]: [%s]\n",
@ -215,7 +215,23 @@ MimeHandlerExec *mhExecFactory(RclConfig *cfg, const string& mtype, string& hs,
MimeHandlerExec *h = multiple ? MimeHandlerExec *h = multiple ?
new MimeHandlerExecMultiple(cfg, id) : new MimeHandlerExecMultiple(cfg, id) :
new MimeHandlerExec(cfg, id); new MimeHandlerExec(cfg, id);
list<string>::iterator it = cmdtoks.begin(); vector<string>::iterator it = cmdtoks.begin();
#ifdef _WIN32
// Special-case python on windows: we need to also locate the
// first argument which is the script name "python somescript.py".
// On Unix, thanks to #!, we just run "somescript.py"
if (!stringlowercmp("python", *it)) {
if (cmdtoks.size() < 2) {
LOGERR(("mhExecFactory: python line has no script?. [%s]: [%s]\n",
mtype.c_str(), hs.c_str()));
}
vector<string>::iterator it1(it);
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());