diff options
Diffstat (limited to 'src/ConfigParser.cpp')
| -rw-r--r-- | src/ConfigParser.cpp | 82 |
1 files changed, 43 insertions, 39 deletions
diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp index d484787..f51eb03 100644 --- a/src/ConfigParser.cpp +++ b/src/ConfigParser.cpp @@ -102,61 +102,65 @@ static void parse_linkage(ptree& pt, bool active = pt_set.get("active", true); bool hard = pt_set.get("hard", true); bool international = pt_set.get("international", false); - string service_uid = pt_set.get("keyservice", ""); - if (service_uid.empty()) { - etiLog.level(error) << "Key Service for linking set " << - setuid << " invalid or missing"; - throw runtime_error("Invalid service linking definition"); - } auto linkageset = make_shared<LinkageSet>(setuid, lsn, active, hard, international); linkageset->keyservice = service_uid; // TODO check if it exists auto pt_list = pt_set.get_child_optional("list"); - if (not pt_list) { - etiLog.level(error) << "list missing in linking set " << - setuid; - throw runtime_error("Invalid service linking definition"); - } - for (const auto& it : *pt_list) { - const string linkuid = it.first; - const ptree pt_link = it.second; - - ServiceLink link; - - string link_type = pt_link.get("type", ""); - if (link_type == "dab") link.type = ServiceLinkType::DAB; - else if (link_type == "fm") link.type = ServiceLinkType::FM; - else if (link_type == "drm") link.type = ServiceLinkType::DRM; - else if (link_type == "amss") link.type = ServiceLinkType::AMSS; - else { - etiLog.level(error) << "Invalid type " << link_type << - " for link " << linkuid; + if (service_uid.empty()) { + if (pt_list) { + etiLog.level(error) << "list defined but no keyservice in linking set " << + setuid; throw runtime_error("Invalid service linking definition"); } - - link.id = hexparse(pt_link.get("id", "0")); - if (link.id == 0) { - etiLog.level(error) << "id for link " << - linkuid << " invalid or missing"; + } + else { + if (not pt_list) { + etiLog.level(error) << "list missing in linking set " << + setuid; throw runtime_error("Invalid service linking definition"); } - if (international) { - link.ecc = hexparse(pt_link.get("ecc", "0")); - if (link.ecc == 0) { - etiLog.level(error) << "ecc for link " << + for (const auto& it : *pt_list) { + const string linkuid = it.first; + const ptree pt_link = it.second; + + ServiceLink link; + + string link_type = pt_link.get("type", ""); + if (link_type == "dab") link.type = ServiceLinkType::DAB; + else if (link_type == "fm") link.type = ServiceLinkType::FM; + else if (link_type == "drm") link.type = ServiceLinkType::DRM; + else if (link_type == "amss") link.type = ServiceLinkType::AMSS; + else { + etiLog.level(error) << "Invalid type " << link_type << + " for link " << linkuid; + throw runtime_error("Invalid service linking definition"); + } + + link.id = hexparse(pt_link.get("id", "0")); + if (link.id == 0) { + etiLog.level(error) << "id for link " << linkuid << " invalid or missing"; throw runtime_error("Invalid service linking definition"); } - } - else { - link.ecc = 0; - } - linkageset->id_list.push_back(link); + if (international) { + link.ecc = hexparse(pt_link.get("ecc", "0")); + if (link.ecc == 0) { + etiLog.level(error) << "ecc for link " << + linkuid << " invalid or missing"; + throw runtime_error("Invalid service linking definition"); + } + } + else { + link.ecc = 0; + } + + linkageset->id_list.push_back(link); + } } ensemble->linkagesets.push_back(linkageset); } |