Add support back for resolving group names in NodeResolver

This commit is contained in:
kwolekr 2014-12-29 23:15:53 -05:00
parent f12118c38b
commit c6df2bc42c

@ -1356,6 +1356,7 @@ bool CNodeDefManager::getIdsFromResolveInfo(NodeResolveInfo *nri,
std::string name = nri->nodenames.front(); std::string name = nri->nodenames.front();
nri->nodenames.pop_front(); nri->nodenames.pop_front();
if (name.substr(0,6) != "group:") {
if (getId(name, c)) { if (getId(name, c)) {
result.push_back(c); result.push_back(c);
} else if (listinfo.all_required) { } else if (listinfo.all_required) {
@ -1364,6 +1365,13 @@ bool CNodeDefManager::getIdsFromResolveInfo(NodeResolveInfo *nri,
result.push_back(listinfo.c_fallback); result.push_back(listinfo.c_fallback);
success = false; success = false;
} }
} else {
std::set<content_t> cids;
std::set<content_t>::iterator it;
getIds(name, cids);
for (it = cids.begin(); it != cids.end(); ++it)
result.push_back(*it);
}
} }
return success; return success;