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

Changed old beaglexx identifiers to webxx. Still some remaining

Browse Source
This commit is contained in:
Jean-Francois Dockes 2017-11-24 14:04:44 +01:00
parent cd44aa33e1
commit c123b17f19
3 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/index/indexer.cpp
View File

@ -49,17 +49,17 @@ void addIdxReason(string who, string reason)
ConfIndexer::ConfIndexer(RclConfig *cnf, DbIxStatusUpdater *updfunc) ConfIndexer::ConfIndexer(RclConfig *cnf, DbIxStatusUpdater *updfunc)
: m_config(cnf), m_db(cnf), m_fsindexer(0), : m_config(cnf), m_db(cnf), m_fsindexer(0),
m_dobeagle(false), m_beagler(0), m_doweb(false), m_webindexer(0),
m_updater(updfunc) m_updater(updfunc)
{ {
m_config->getConfParam("processwebqueue", &m_dobeagle); m_config->getConfParam("processwebqueue", &m_doweb);
} }
ConfIndexer::~ConfIndexer() ConfIndexer::~ConfIndexer()
{ {
deleteZ(m_fsindexer); deleteZ(m_fsindexer);
#ifndef DISABLE_WEB_INDEXER #ifndef DISABLE_WEB_INDEXER
deleteZ(m_beagler); deleteZ(m_webindexer);
#endif #endif
} }
@ -124,10 +124,10 @@ bool ConfIndexer::index(bool resetbefore, ixType typestorun, int flags)
} }
} }
#ifndef DISABLE_WEB_INDEXER #ifndef DISABLE_WEB_INDEXER
if (m_dobeagle && (typestorun & IxTBeagleQueue)) { if (m_doweb && (typestorun & IxTWebQueue)) {
deleteZ(m_beagler); deleteZ(m_webindexer);
m_beagler = new BeagleQueueIndexer(m_config, &m_db, m_updater); m_webindexer = new BeagleQueueIndexer(m_config, &m_db, m_updater);
if (!m_beagler || !m_beagler->index()) { if (!m_webindexer || !m_webindexer->index()) {
m_db.close(); m_db.close();
addIdxReason("indexer", "Web index creation failed. See log"); addIdxReason("indexer", "Web index creation failed. See log");
return false; return false;
@ -137,7 +137,7 @@ bool ConfIndexer::index(bool resetbefore, ixType typestorun, int flags)
if (typestorun == IxTAll) { if (typestorun == IxTAll) {
// Get rid of all database entries that don't exist in the // Get rid of all database entries that don't exist in the
// filesystem anymore. Only if all *configured* indexers ran. // 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, "")) {
m_db.close(); m_db.close();
addIdxReason("indexer", "Index purge failed. See log"); addIdxReason("indexer", "Index purge failed. See log");
return false; return false;
@ -201,11 +201,11 @@ bool ConfIndexer::indexFiles(list<string>& ifiles, int flag)
myfiles.size() << " files remainining\n"); myfiles.size() << " files remainining\n");
#ifndef DISABLE_WEB_INDEXER #ifndef DISABLE_WEB_INDEXER
if (m_dobeagle && !myfiles.empty() && !(flag & IxFNoWeb)) { if (m_doweb && !myfiles.empty() && !(flag & IxFNoWeb)) {
if (!m_beagler) if (!m_webindexer)
m_beagler = new BeagleQueueIndexer(m_config, &m_db, m_updater); m_webindexer = new BeagleQueueIndexer(m_config, &m_db, m_updater);
if (m_beagler) { if (m_webindexer) {
ret = ret && m_beagler->indexFiles(myfiles); ret = ret && m_webindexer->indexFiles(myfiles);
} else { } else {
ret = false; ret = false;
} }
@ -261,11 +261,11 @@ bool ConfIndexer::purgeFiles(std::list<string> &files, int flag)
ret = m_fsindexer->purgeFiles(myfiles); ret = m_fsindexer->purgeFiles(myfiles);
#ifndef DISABLE_WEB_INDEXER #ifndef DISABLE_WEB_INDEXER
if (m_dobeagle && !myfiles.empty() && !(flag & IxFNoWeb)) { if (m_doweb && !myfiles.empty() && !(flag & IxFNoWeb)) {
if (!m_beagler) if (!m_webindexer)
m_beagler = new BeagleQueueIndexer(m_config, &m_db, m_updater); m_webindexer = new BeagleQueueIndexer(m_config, &m_db, m_updater);
if (m_beagler) { if (m_webindexer) {
ret = ret && m_beagler->purgeFiles(myfiles); ret = ret && m_webindexer->purgeFiles(myfiles);
} else { } else {
ret = false; ret = false;
} }

8
src/index/indexer.h
View File

@ -96,8 +96,8 @@ class ConfIndexer {
virtual ~ConfIndexer(); virtual ~ConfIndexer();
// Indexer types. Maybe we'll have something more dynamic one day // Indexer types. Maybe we'll have something more dynamic one day
enum ixType {IxTNone, IxTFs=1, IxTBeagleQueue=2, enum ixType {IxTNone, IxTFs=1, IxTWebQueue=2,
IxTAll = IxTFs | IxTBeagleQueue}; IxTAll = IxTFs | IxTWebQueue};
// Misc indexing flags // Misc indexing flags
enum IxFlag {IxFNone = 0, enum IxFlag {IxFNone = 0,
IxFIgnoreSkip = 1, // Ignore skipped lists IxFIgnoreSkip = 1, // Ignore skipped lists
@ -145,8 +145,8 @@ class ConfIndexer {
RclConfig *m_config; RclConfig *m_config;
Rcl::Db m_db; Rcl::Db m_db;
FsIndexer *m_fsindexer; FsIndexer *m_fsindexer;
bool m_dobeagle; bool m_doweb;
BeagleQueueIndexer *m_beagler; BeagleQueueIndexer *m_webindexer;
DbIxStatusUpdater *m_updater; DbIxStatusUpdater *m_updater;
string m_reason; string m_reason;

4
src/index/recollindex.cpp
View File

@ -26,6 +26,7 @@
#else #else
#include <direct.h> #include <direct.h>
#endif #endif
#include "safesysstat.h"
#include "safefcntl.h" #include "safefcntl.h"
#include "safeunistd.h" #include "safeunistd.h"
@ -330,7 +331,8 @@ static bool checktopdirs(RclConfig *config, vector<string>& nonexist)
} }
} }
// We'd like to check skippedPaths too, but these are wildcard exprs, so reasonably can't // We'd like to check skippedPaths too, but these are wildcard
// exprs, so reasonably can't
return true; return true;
} }