EPICS_base/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Allow "meta" at member top of array of struct

Browse Source
This commit is contained in:
Michael Davidsaver
2022-11-02 10:53:20 -07:00
parent 3b9990e365
commit 2a53ea7e47
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
iocBoot/iocimagedemo/image.db
View File

@ -74,3 +74,17 @@ record(mbbi, "$(N):ColorMode") {
}
})
}
record(bo, "$(N):extra") {
field(ZNAM, "foo")
field(ONAM, "bar")
info(Q:group, {
"$(N):Array":{
"attribute[1].value":{+type:"any",
+channel:"VAL",
+putorder:0,
+trigger:"attribute[1].value"},
"attribute[1]":{+type:"meta", +channel:"SEVR"}
}
})
}

9
pdbApp/pdb.cpp
View File

@ -438,6 +438,9 @@ PDBProvider::PDBProvider(const epics::pvAccess::Configuration::const_shared_poin
else
builder = builder->addNestedStructure(parts[j].name);
}
if(parts.back().isArray()) {
builder = builder->addNestedStructureArray(parts.back().name);
}
}
if(!mem.structID.empty())
@ -457,7 +460,7 @@ PDBProvider::PDBProvider(const epics::pvAccess::Configuration::const_shared_poin
std::tr1::shared_ptr<PVIFBuilder> pvifbuilder(PVIFBuilder::create(mem.type, chan.chan));
if(!parts.empty())
if(!parts.empty() && !parts.back().isArray())
builder = pvifbuilder->dtype(builder, parts.back().name);
else
builder = pvifbuilder->dtype(builder, "");
@ -465,6 +468,8 @@ PDBProvider::PDBProvider(const epics::pvAccess::Configuration::const_shared_poin
if(!parts.empty()) {
for(size_t j=0; j<parts.size()-1; j++)
builder = builder->endNested();
if(parts.back().isArray())
builder = builder->endNested();
}
if(!mem.pvname.empty()) {
@ -744,8 +749,6 @@ FieldName::FieldName(const std::string& pv)
}
if(parts.empty())
throw std::runtime_error("Empty field name");
if(parts.back().isArray())
throw std::runtime_error("leaf field may not have sub-script : "+pv);
}
epics::pvData::PVFieldPtr