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

add autosplitting getconfparam() overloads

Browse Source
This commit is contained in:
Jean-Francois Dockes 2010-09-10 09:34:43 +02:00
parent ad1c126d51
commit f3b0b49c77
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/common/rclconfig.cpp
View File

@ -269,19 +269,35 @@ bool RclConfig::getConfParam(const std::string &name, bool *bvp)
return true;
}
bool RclConfig::getConfParam(const std::string &name, vector<string> *svvp)
{
if (!svvp)
return false;
svvp->clear();
string s;
if (!getConfParam(name, s))
return false;
return stringToStrings(s, *svvp);
}
bool RclConfig::getConfParam(const std::string &name, list<string> *svvp)
{
if (!svvp)
return false;
svvp->clear();
string s;
if (!getConfParam(name, s))
return false;
return stringToStrings(s, *svvp);
}
list<string> RclConfig::getTopdirs()
{
list<string> tdl;
// Retrieve the list of directories to be indexed.
string topdirs;
if (!getConfParam("topdirs", topdirs)) {
LOGERR(("RclConfig::getTopdirs: no top directories in config\n"));
return tdl;
}
if (!stringToStrings(topdirs, tdl)) {
LOGERR(("RclConfig::getTopdirs: parse error for directory list\n"));
if (!getConfParam("topdirs", &tdl)) {
LOGERR(("RclConfig::getTopdirs: no top directories in config or bad list format\n"));
return tdl;
}
for (list<string>::iterator it = tdl.begin(); it != tdl.end(); it++) {
*it = path_tildexpand(*it);
*it = path_canon(*it);
@ -807,10 +823,8 @@ list<string>& RclConfig::getSkippedNames()
list<string> RclConfig::getSkippedPaths()
{
list<string> skpl;
string skipped;
if (getConfParam("skippedPaths", skipped)) {
stringToStrings(skipped, skpl);
}
getConfParam("skippedPaths", &skpl);
// Always add the dbdir and confdir to the skipped paths. This is
// especially important for the rt monitor which will go into a loop if we
// don't do this.
@ -830,10 +844,7 @@ list<string> RclConfig::getDaemSkippedPaths()
list<string> skpl = getSkippedPaths();
list<string> dskpl;
string skipped;
if (getConfParam("daemSkippedPaths", skipped)) {
stringToStrings(skipped, dskpl);
}
getConfParam("daemSkippedPaths", &dskpl);
for (list<string>::iterator it = dskpl.begin(); it != dskpl.end(); it++) {
*it = path_tildexpand(*it);

8
src/common/rclconfig.h
View File

@ -97,9 +97,13 @@ class RclConfig {
return m_conf->get(name, value, m_keydir);
}
/** Variant with autoconversion to int */
bool getConfParam(const std::string &name, int *value);
bool getConfParam(const string &name, int *value);
/** Variant with autoconversion to bool */
bool getConfParam(const std::string &name, bool *value);
bool getConfParam(const string &name, bool *value);
/** Variant with conversion to string list/vector
* (stringToStrings). Can fail if the string is malformed. */
bool getConfParam(const string &name, vector<string> *value);
bool getConfParam(const string &name, list<string> *value);
/**
* Get list of config names under current sk, with possible