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

confstack: implement 'shallow' option for getnames()

Browse Source
This commit is contained in:
Jean-Francois Dockes 2012-02-18 09:20:15 +01:00
parent 3daaa548f4
commit fab69fc3a1
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/utils/conftree.h
View File

@ -165,7 +165,8 @@ public:
* Set value for named parameter in specified subsection (or global) * Set value for named parameter in specified subsection (or global)
* @return 0 for error, 1 else * @return 0 for error, 1 else
*/ */
virtual int set(const string &nm, const string &val, const string &sk = string()); virtual int set(const string &nm, const string &val,
const string &sk = string());
/** /**
* Remove name and value from config * Remove name and value from config
@ -208,6 +209,11 @@ public:
*/ */
virtual list<string> getSubKeys(bool) {return getSubKeys();} virtual list<string> getSubKeys(bool) {return getSubKeys();}
virtual list<string> getSubKeys(); virtual list<string> getSubKeys();
/** Test for subkey existence */
virtual bool hasSubKey(const string& sk)
{
return m_submaps.find(sk) != m_submaps.end();
}
virtual string getFilename() {return m_filename;} virtual string getFilename() {return m_filename;}
@ -424,13 +430,28 @@ public:
} }
virtual list<string> getNames(const string &sk, const char *pattern = 0) virtual list<string> getNames(const string &sk, const char *pattern = 0)
{
return getNames1(sk, pattern, false);
}
virtual list<string> getNamesShallow(const string &sk, const char *patt = 0)
{
return getNames1(sk, patt, true);
}
virtual list<string> getNames1(const string &sk, const char *pattern,
bool shallow)
{ {
list<string> nms; list<string> nms;
typename list<T*>::iterator it; typename list<T*>::iterator it;
bool skfound = false;
for (it = m_confs.begin();it != m_confs.end(); it++) { for (it = m_confs.begin();it != m_confs.end(); it++) {
list<string> lst; if ((*it)->hasSubKey(sk)) {
lst = (*it)->getNames(sk, pattern); skfound = true;
nms.insert(nms.end(), lst.begin(), lst.end()); list<string> lst = (*it)->getNames(sk, pattern);
nms.insert(nms.end(), lst.begin(), lst.end());
}
if (shallow && skfound)
break;
} }
nms.sort(); nms.sort();
nms.unique(); nms.unique();