|
a/src/common/rclconfig.cpp |
|
b/src/common/rclconfig.cpp |
|
... |
|
... |
| 208 |
}
|
208 |
}
|
| 209 |
LOGDEB1(("RclConfig::getDefCharset: localecharset [%s]\n",
|
209 |
LOGDEB1(("RclConfig::getDefCharset: localecharset [%s]\n",
|
| 210 |
o_localecharset.c_str()));
|
210 |
o_localecharset.c_str()));
|
| 211 |
}
|
211 |
}
|
| 212 |
|
212 |
|
|
|
213 |
const char *cp;
|
|
|
214 |
|
|
|
215 |
// Additional config directory, values override user ones
|
|
|
216 |
if ((cp = getenv("RECOLL_CONFTOP"))) {
|
|
|
217 |
m_cdirs.push_back(cp);
|
|
|
218 |
}
|
|
|
219 |
|
|
|
220 |
// User config
|
| 213 |
m_cdirs.push_back(m_confdir);
|
221 |
m_cdirs.push_back(m_confdir);
|
|
|
222 |
|
|
|
223 |
// Additional config directory, overrides system's, overridden by user's
|
|
|
224 |
if ((cp = getenv("RECOLL_CONFMID"))) {
|
|
|
225 |
m_cdirs.push_back(cp);
|
|
|
226 |
}
|
|
|
227 |
|
|
|
228 |
// Base/installation config
|
| 214 |
m_cdirs.push_back(path_cat(m_datadir, "examples"));
|
229 |
m_cdirs.push_back(path_cat(m_datadir, "examples"));
|
| 215 |
string cnferrloc = m_confdir + " or " + path_cat(m_datadir, "examples");
|
230 |
|
|
|
231 |
string cnferrloc;
|
|
|
232 |
for (vector<string>::const_iterator it = m_cdirs.begin();
|
|
|
233 |
it != m_cdirs.end(); it++) {
|
|
|
234 |
if (it != m_cdirs.begin())
|
|
|
235 |
cnferrloc += string(" or ");
|
|
|
236 |
cnferrloc += *it;
|
|
|
237 |
}
|
| 216 |
|
238 |
|
| 217 |
// Read and process "recoll.conf"
|
239 |
// Read and process "recoll.conf"
|
| 218 |
if (!updateMainConfig())
|
240 |
if (!updateMainConfig())
|
| 219 |
return;
|
241 |
return;
|
| 220 |
// Other files
|
242 |
// Other files
|