|
a/src/common/rclconfig.cpp |
|
b/src/common/rclconfig.cpp |
|
... |
|
... |
| 181 |
return;
|
181 |
return;
|
| 182 |
}
|
182 |
}
|
| 183 |
|
183 |
|
| 184 |
bool RclConfig::updateMainConfig()
|
184 |
bool RclConfig::updateMainConfig()
|
| 185 |
{
|
185 |
{
|
|
|
186 |
LOGDEB(("RclConfig::updateMainConfig\n"));
|
|
|
187 |
ConfStack<ConfTree> *newconf =
|
| 186 |
m_conf = new ConfStack<ConfTree>("recoll.conf", m_cdirs, true);
|
188 |
new ConfStack<ConfTree>("recoll.conf", m_cdirs, true);
|
| 187 |
if (m_conf == 0 || !m_conf->ok()) {
|
189 |
if (newconf == 0 || !newconf->ok()) {
|
|
|
190 |
if (m_conf)
|
|
|
191 |
return false;
|
| 188 |
string where;
|
192 |
string where;
|
| 189 |
stringsToString(m_cdirs, where);
|
193 |
stringsToString(m_cdirs, where);
|
| 190 |
m_reason = string("No/bad main configuration file in: ") + where;
|
194 |
m_reason = string("No/bad main configuration file in: ") + where;
|
| 191 |
m_ok = false;
|
195 |
m_ok = false;
|
| 192 |
m_skpnstate.init(this, 0, "skippedNames");
|
196 |
m_skpnstate.init(this, 0, "skippedNames");
|
|
... |
|
... |
| 209 |
bool nonum = false;
|
213 |
bool nonum = false;
|
| 210 |
if (getConfParam("nonumbers", &nonum) && nonum == true) {
|
214 |
if (getConfParam("nonumbers", &nonum) && nonum == true) {
|
| 211 |
TextSplit::noNumbers();
|
215 |
TextSplit::noNumbers();
|
| 212 |
}
|
216 |
}
|
| 213 |
|
217 |
|
|
|
218 |
delete m_conf;
|
|
|
219 |
m_conf = newconf;
|
| 214 |
m_skpnstate.init(this, m_conf, "skippedNames");
|
220 |
m_skpnstate.init(this, m_conf, "skippedNames");
|
| 215 |
m_rmtstate.init(this, m_conf, "indexedmimetypes");
|
221 |
m_rmtstate.init(this, m_conf, "indexedmimetypes");
|
| 216 |
return true;
|
222 |
return true;
|
| 217 |
}
|
223 |
}
|
| 218 |
|
224 |
|