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

centralize skippedNames computation to add dbdir always

Browse Source
This commit is contained in:
dockes
2006-10-24 09:09:36 +00:00
parent c78a055bb2
commit d8f8dd851e
4 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/index/indexer.cpp
+4 -13
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: indexer.cpp,v 1.39 2006-10-22 14:47:13 dockes Exp $ (C) 2004 J.F.Dockes";
static char rcsid[] = "@(#$Id: indexer.cpp,v 1.40 2006-10-24 09:09:36 dockes Exp $ (C) 2004 J.F.Dockes";
#endif
/*
* This program is free software; you can redistribute it and/or modify
@@ -96,13 +96,7 @@ bool DbIndexer::indexDb(bool resetbefore, list<string> *topdirs)
// Set up skipped patterns for this subtree. This probably should be
// done in the directory change code in processone() instead.
m_walker.clearSkippedNames();
string skipped;
if (m_config->getConfParam("skippedNames", skipped)) {
list<string> skpl;
stringToStrings(skipped, skpl);
m_walker.setSkippedNames(skpl);
}
m_walker.setSkippedNames(m_config->getSkippedNames());
// Walk the directory tree
if (m_walker.walk(*it, *this) != FsTreeWalker::FtwOk) {
@@ -238,11 +232,8 @@ bool DbIndexer::indexFiles(const list<string> &filenames)
static list<string> skpl;
if (lstdir.compare(dir)) {
LOGDEB(("Recomputing list of skipped names\n"));
string skipped;
if (m_config->getConfParam("skippedNames", skipped)) {
stringToStrings(skipped, skpl);
lstdir = dir;
}
skpl = m_config->getSkippedNames();
lstdir = dir;
}
if (!skpl.empty()) {
list<string>::const_iterator skit;
src/index/rclmonrcv.cpp
+2 -8
View File
@@ -1,7 +1,7 @@
#include "autoconfig.h"
#ifdef RCL_MONITOR
#ifndef lint
static char rcsid[] = "@(#$Id: rclmonrcv.cpp,v 1.5 2006-10-23 15:01:12 dockes Exp $ (C) 2006 J.F.Dockes";
static char rcsid[] = "@(#$Id: rclmonrcv.cpp,v 1.6 2006-10-24 09:09:36 dockes Exp $ (C) 2006 J.F.Dockes";
#endif
/*
* This program is free software; you can redistribute it and/or modify
@@ -129,13 +129,7 @@ void *rclMonRcvRun(void *q)
for (list<string>::iterator it = tdl.begin(); it != tdl.end(); it++) {
queue->getConfig()->setKeyDir(*it);
// Adjust the skipped names according to config
walker.clearSkippedNames();
string skipped;
if (queue->getConfig()->getConfParam("skippedNames", skipped)) {
list<string> skpl;
stringToStrings(skipped, skpl);
walker.setSkippedNames(skpl);
}
walker.setSkippedNames(queue->getConfig()->getSkippedNames());
LOGDEB(("rclMonRcvRun: walking %s\n", it->c_str()));
walker.walk(*it, walkcb);
}