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

more auto use in fsindexer.cpp

Browse Source
This commit is contained in:
Jean-Francois Dockes 2022-09-05 18:53:06 +02:00
parent 6aa5ef9064
commit c96d29e3a3
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/index/fsindexer.cpp
View File

@ -377,7 +377,7 @@ bool FsIndexer::indexFiles(list<string>& files, int flags)
FsTreeWalker walker; FsTreeWalker walker;
walker.setSkippedPaths(m_config->getSkippedPaths()); walker.setSkippedPaths(m_config->getSkippedPaths());
for (list<string>::iterator it = files.begin(); it != files.end(); ) { for (auto it = files.begin(); it != files.end(); ) {
LOGDEB2("FsIndexer::indexFiles: [" << *it << "]\n"); LOGDEB2("FsIndexer::indexFiles: [" << *it << "]\n");
m_config->setKeyDir(path_getfather(*it)); m_config->setKeyDir(path_getfather(*it));
@ -426,11 +426,9 @@ out:
// Purge possible orphan documents // Purge possible orphan documents
if (ret == true) { if (ret == true) {
LOGDEB("Indexfiles: purging orphans\n"); LOGDEB("Indexfiles: purging orphans\n");
const vector<string>& purgecandidates = m_purgeCandidates.getCandidates(); for (const auto& udi : m_purgeCandidates.getCandidates()) {
for (vector<string>::const_iterator it = purgecandidates.begin(); LOGDEB("Indexfiles: purging orphans for " << udi << "\n");
it != purgecandidates.end(); it++) { m_db->purgeOrphans(udi);
LOGDEB("Indexfiles: purging orphans for " << *it << "\n");
m_db->purgeOrphans(*it);
} }
#ifdef IDX_THREADS #ifdef IDX_THREADS
m_db->waitUpdIdle(); m_db->waitUpdIdle();
@ -494,10 +492,9 @@ void FsIndexer::localfieldsfromconf()
ConfSimple attrs; ConfSimple attrs;
m_config->valueSplitAttributes(sfields, value, attrs); m_config->valueSplitAttributes(sfields, value, attrs);
vector<string> nmlst = attrs.getNames(cstr_null); vector<string> nmlst = attrs.getNames(cstr_null);
for (vector<string>::const_iterator it = nmlst.begin(); for (const auto& anm : nmlst) {
it != nmlst.end(); it++) { string nm = m_config->fieldCanon(anm);
string nm = m_config->fieldCanon(*it); attrs.get(anm, m_localfields[nm]);
attrs.get(*it, m_localfields[nm]);
LOGDEB2("FsIndexer::localfieldsfromconf: [" << nm << "]->[" << LOGDEB2("FsIndexer::localfieldsfromconf: [" << nm << "]->[" <<
m_localfields[nm] << "]\n"); m_localfields[nm] << "]\n");
} }
@ -505,12 +502,11 @@ void FsIndexer::localfieldsfromconf()
void FsIndexer::setlocalfields(const map<string, string>& fields, Rcl::Doc& doc) void FsIndexer::setlocalfields(const map<string, string>& fields, Rcl::Doc& doc)
{ {
for (map<string, string>::const_iterator it = fields.begin(); for (const auto& field : fields) {
it != fields.end(); it++) {
// Being chosen by the user, localfields override values from // Being chosen by the user, localfields override values from
// the filter. The key is already canonic (see // the filter. The key is already canonic (see
// localfieldsfromconf()) // localfieldsfromconf())
doc.meta[it->first] = it->second; doc.meta[field.first] = field.second;
} }
} }
@ -846,9 +842,7 @@ FsTreeWalker::Status FsIndexer::processonefile(
} }
} }
#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_DONTNEED) #if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_DONTNEED)
// See framagit issue 26. If this appears to be a good idea // See framagit issue 26. This is off by default and controlled by a command line switch.
// after all (not sure), we'll need a command line switch to
// control it. For now it's compile-time only.
if (m_cleancache) { if (m_cleancache) {
int fd = open(fn.c_str(), O_RDONLY); int fd = open(fn.c_str(), O_RDONLY);
if (fd >= 0) { if (fd >= 0) {