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

fix compile issue with idxthreads enabled

Browse Source
This commit is contained in:
Jean-Francois Dockes 2013-01-28 09:45:33 +01:00
parent 66b59c9963
commit e8afc66d8f
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/index/fsindexer.cpp
View File

@ -72,13 +72,13 @@ extern void *FsIndexerDbUpdWorker(void*);
class InternfileTask { class InternfileTask {
public: public:
InternfileTask(const std::string &f, const struct stat *i_stp, InternfileTask(const std::string &f, const struct stat *i_stp,
map<string,string> lfields, vector<MDReaper> reapers) map<string,string> lfields, vector<FsIndexer::MDReaper> reapers)
: fn(f), statbuf(*i_stp), localfields(lfields), mdreapers(reapers) : fn(f), statbuf(*i_stp), localfields(lfields), mdreapers(reapers)
{} {}
string fn; string fn;
struct stat statbuf; struct stat statbuf;
map<string,string> localfields; map<string,string> localfields;
vector<MDReapers> mdreapers; vector<FsIndexer::MDReaper> mdreapers;
}; };
extern void *FsIndexerInternfileWorker(void*); extern void *FsIndexerInternfileWorker(void*);
#endif // IDX_THREADS #endif // IDX_THREADS
@ -542,7 +542,7 @@ void *FsIndexerInternfileWorker(void * fsp)
} }
LOGDEB0(("FsIndexerInternfileWorker: task fn %s\n", tsk->fn.c_str())); LOGDEB0(("FsIndexerInternfileWorker: task fn %s\n", tsk->fn.c_str()));
if (fip->processonefile(&myconf, tmpdir, tsk->fn, &tsk->statbuf, if (fip->processonefile(&myconf, tmpdir, tsk->fn, &tsk->statbuf,
tsk->localfields) != tsk->localfields, tsk->mdreapers) !=
FsTreeWalker::FtwOk) { FsTreeWalker::FtwOk) {
LOGERR(("FsIndexerInternfileWorker: processone failed\n")); LOGERR(("FsIndexerInternfileWorker: processone failed\n"));
tqp->workerExit(); tqp->workerExit();

11
src/index/fsindexer.h
View File

@ -78,6 +78,12 @@ class FsIndexer : public FsTreeWalkerCB {
/** Make signature for file up to date checks */ /** Make signature for file up to date checks */
static void makesig(const struct stat *stp, string& out); static void makesig(const struct stat *stp, string& out);
/* Hold the description for an external metadata-gathering command */
struct MDReaper {
string fieldname;
vector<string> cmdv;
};
private: private:
FsTreeWalker m_walker; FsTreeWalker m_walker;
RclConfig *m_config; RclConfig *m_config;
@ -98,11 +104,6 @@ class FsIndexer : public FsTreeWalkerCB {
// Same idea with the metadata-gathering external commands, // Same idea with the metadata-gathering external commands,
// (e.g. used to reap tagging info: "tmsu tags %f") // (e.g. used to reap tagging info: "tmsu tags %f")
/* Hold the description for an external metadata-gathering command */
struct MDReaper {
string fieldname;
vector<string> cmdv;
};
bool m_havemdreapers; bool m_havemdreapers;
string m_smdreapers; string m_smdreapers;
vector<MDReaper> m_mdreapers; vector<MDReaper> m_mdreapers;