From 44c8cd95e66f7be71e2753c0593a38c7ff1fb589 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 14 Sep 2017 15:41:17 -0500 Subject: [PATCH] pdb group minor --- pdbApp/pdb.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pdbApp/pdb.cpp b/pdbApp/pdb.cpp index b637eb4..5dfb8c4 100644 --- a/pdbApp/pdb.cpp +++ b/pdbApp/pdb.cpp @@ -149,9 +149,11 @@ struct PDBProcessor const char *json = rec.info("Q:group"); if(!json) continue; - GroupConfig conf; try { + GroupConfig conf; GroupConfig::parse(json, conf); + if(!conf.warning.empty()) + fprintf(stderr, "%s: warning(s) from info(Q:group, ...\n%s", rec.record()->name, conf.warning.c_str()); recbase = rec.record()->name; recbase += "."; @@ -162,6 +164,11 @@ struct PDBProcessor const std::string& grpname = git->first; const GroupConfig::Group& grp = git->second; + if(dbChannelTest(grpname.c_str())==0) { + fprintf(stderr, "%s : Group name conflicts with record name. Ignoring...\n", grpname.c_str()); + continue; + } + groups_t::iterator it = groups.find(grpname); if(it==groups.end()) { // lazy creation of group