|
a/src/index/indexer.cpp |
|
b/src/index/indexer.cpp |
|
... |
|
... |
| 23 |
#include <unistd.h>
|
23 |
#include <unistd.h>
|
| 24 |
#include <errno.h>
|
24 |
#include <errno.h>
|
| 25 |
|
25 |
|
| 26 |
#include <algorithm>
|
26 |
#include <algorithm>
|
| 27 |
|
27 |
|
|
|
28 |
#include "cstr.h"
|
| 28 |
#include "debuglog.h"
|
29 |
#include "debuglog.h"
|
| 29 |
#include "indexer.h"
|
30 |
#include "indexer.h"
|
| 30 |
#include "fsindexer.h"
|
31 |
#include "fsindexer.h"
|
| 31 |
#include "beaglequeue.h"
|
32 |
#include "beaglequeue.h"
|
| 32 |
#include "mimehandler.h"
|
33 |
#include "mimehandler.h"
|
|
... |
|
... |
| 56 |
LOGERR(("ConfIndexer: error opening database %s : %s\n",
|
57 |
LOGERR(("ConfIndexer: error opening database %s : %s\n",
|
| 57 |
m_config->getDbDir().c_str(), m_db.getReason().c_str()));
|
58 |
m_config->getDbDir().c_str(), m_db.getReason().c_str()));
|
| 58 |
return false;
|
59 |
return false;
|
| 59 |
}
|
60 |
}
|
| 60 |
|
61 |
|
| 61 |
m_config->setKeyDir("");
|
62 |
m_config->setKeyDir(cstr_null);
|
| 62 |
if (typestorun & IxTFs) {
|
63 |
if (typestorun & IxTFs) {
|
| 63 |
deleteZ(m_fsindexer);
|
64 |
deleteZ(m_fsindexer);
|
| 64 |
m_fsindexer = new FsIndexer(m_config, &m_db, m_updater);
|
65 |
m_fsindexer = new FsIndexer(m_config, &m_db, m_updater);
|
| 65 |
if (!m_fsindexer || !m_fsindexer->index()) {
|
66 |
if (!m_fsindexer || !m_fsindexer->index()) {
|
| 66 |
return false;
|
67 |
return false;
|
|
... |
|
... |
| 116 |
if (!m_db.open(Rcl::Db::DbUpd)) {
|
117 |
if (!m_db.open(Rcl::Db::DbUpd)) {
|
| 117 |
LOGERR(("ConfIndexer: indexFiles error opening database %s\n",
|
118 |
LOGERR(("ConfIndexer: indexFiles error opening database %s\n",
|
| 118 |
m_config->getDbDir().c_str()));
|
119 |
m_config->getDbDir().c_str()));
|
| 119 |
return false;
|
120 |
return false;
|
| 120 |
}
|
121 |
}
|
| 121 |
m_config->setKeyDir("");
|
122 |
m_config->setKeyDir(cstr_null);
|
| 122 |
bool ret = false;
|
123 |
bool ret = false;
|
| 123 |
if (!m_fsindexer)
|
124 |
if (!m_fsindexer)
|
| 124 |
m_fsindexer = new FsIndexer(m_config, &m_db, m_updater);
|
125 |
m_fsindexer = new FsIndexer(m_config, &m_db, m_updater);
|
| 125 |
if (m_fsindexer)
|
126 |
if (m_fsindexer)
|
| 126 |
ret = m_fsindexer->indexFiles(myfiles, flag);
|
127 |
ret = m_fsindexer->indexFiles(myfiles, flag);
|
|
... |
|
... |
| 161 |
LOGERR(("ConfIndexer: purgeFiles error opening database %s\n",
|
162 |
LOGERR(("ConfIndexer: purgeFiles error opening database %s\n",
|
| 162 |
m_config->getDbDir().c_str()));
|
163 |
m_config->getDbDir().c_str()));
|
| 163 |
return false;
|
164 |
return false;
|
| 164 |
}
|
165 |
}
|
| 165 |
bool ret = false;
|
166 |
bool ret = false;
|
| 166 |
m_config->setKeyDir("");
|
167 |
m_config->setKeyDir(cstr_null);
|
| 167 |
if (!m_fsindexer)
|
168 |
if (!m_fsindexer)
|
| 168 |
m_fsindexer = new FsIndexer(m_config, &m_db, m_updater);
|
169 |
m_fsindexer = new FsIndexer(m_config, &m_db, m_updater);
|
| 169 |
if (m_fsindexer)
|
170 |
if (m_fsindexer)
|
| 170 |
ret = m_fsindexer->purgeFiles(myfiles);
|
171 |
ret = m_fsindexer->purgeFiles(myfiles);
|
| 171 |
|
172 |
|