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

try to be more responsive to user interrupts: do not build the aux databases after an interruption, and check for an interruption during the purge pass

Browse Source
This commit is contained in:
Jean-Francois Dockes
2011-04-28 12:27:06 +02:00
parent a7b1c272a6
commit a4d1689581
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/index/indexer.cpp
+11 -6
View File
@@ -78,22 +78,27 @@ bool ConfIndexer::index(bool resetbefore, ixType typestorun)
if (typestorun == IxTAll) {
// Get rid of all database entries that don't exist in the
// filesystem anymore. Only if all *configured* indexers ran.
if (m_updater)
m_updater->update(DbIxStatus::DBIXS_PURGE, string());
if (m_updater && !m_updater->update(DbIxStatus::DBIXS_PURGE, string()))
return false;
m_db.purge();
}
// The close would be done in our destructor, but we want status
// here. Makes no sense to check for cancel, we'll have to close
// anyway
if (m_updater)
m_updater->update(DbIxStatus::DBIXS_CLOSING, string());
// The close would be done in our destructor, but we want status here
if (!m_db.close()) {
LOGERR(("ConfIndexer::index: error closing database in %s\n",
m_config->getDbDir().c_str()));
return false;
}
if (m_updater && !m_updater->update(DbIxStatus::DBIXS_CLOSING, string()))
return false;
createStemmingDatabases();
if (m_updater && !m_updater->update(DbIxStatus::DBIXS_CLOSING, string()))
return false;
createAspellDict();
clearMimeHandlerCache();
return true;
@@ -205,8 +210,8 @@ bool ConfIndexer::createStemmingDatabases()
m_db.deleteStemDb(*it);
}
for (it = langs.begin(); it != langs.end(); it++) {
if (m_updater)
m_updater->update(DbIxStatus::DBIXS_STEMDB, *it);
if (m_updater && !m_updater->update(DbIxStatus::DBIXS_STEMDB, *it))
return false;
m_db.createStemDb(*it);
}
}