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

check for cancellation

Browse Source
This commit is contained in:
dockes 2006-01-26 17:59:50 +00:00
parent 3188728dce
commit c5337d174a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/internfile/mh_exec.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: mh_exec.cpp,v 1.5 2006-01-23 13:32:28 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: mh_exec.cpp,v 1.6 2006-01-26 17:59:50 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -22,11 +22,19 @@ static char rcsid[] = "@(#$Id: mh_exec.cpp,v 1.5 2006-01-23 13:32:28 dockes Exp
#include "mh_exec.h" #include "mh_exec.h"
#include "mh_html.h" #include "mh_html.h"
#include "debuglog.h" #include "debuglog.h"
#include "cancelcheck.h"
#ifndef NO_NAMESPACES #ifndef NO_NAMESPACES
using namespace std; using namespace std;
#endif /* NO_NAMESPACES */ #endif /* NO_NAMESPACES */
class MEAdv : public ExecCmdAdvise {
public:
void newData(int) {
CancelCheck::instance().checkCancel();
}
};
// Execute an external program to translate a file from its native format // Execute an external program to translate a file from its native format
// to html. Then call the html parser to do the actual indexing // to html. Then call the html parser to do the actual indexing
MimeHandler::Status MimeHandler::Status
@ -49,10 +57,12 @@ MimeHandlerExec::mkDoc(RclConfig *conf, const string &fn,
// Execute command and store the result text, which is supposedly html // Execute command and store the result text, which is supposedly html
string html; string html;
ExecCmd exec; ExecCmd mexec;
exec.putenv(m_forPreview ? "RECOLL_FILTER_FORPREVIEW=yes" : MEAdv adv;
mexec.setAdvise(&adv);
mexec.putenv(m_forPreview ? "RECOLL_FILTER_FORPREVIEW=yes" :
"RECOLL_FILTER_FORPREVIEW=no"); "RECOLL_FILTER_FORPREVIEW=no");
int status = exec.doexec(cmd, myparams, 0, &html); int status = mexec.doexec(cmd, myparams, 0, &html);
if (status) { if (status) {
LOGERR(("MimeHandlerExec: command status 0x%x: %s\n", LOGERR(("MimeHandlerExec: command status 0x%x: %s\n",
status, cmd.c_str())); status, cmd.c_str()));