epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

hierarchical pvRequest support for testServer

Browse Source
This commit is contained in:
Matej Sekoranja
2012-11-19 10:05:45 +01:00
parent 056eedbe92
commit 33b8117c72
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
testApp/remote/testServer.cpp
View File

@@ -59,7 +59,7 @@ static PVStructure::shared_pointer getRequestedStructure(
if (pvRequest->getSubField(subfieldName))
pvRequestFields = pvRequest->getStructureField(subfieldName);
else
pvRequestFields = pvRequest; // really?!!
pvRequestFields = pvRequest;
// if pvRequest is empty, just use pvStructure
if (pvRequestFields->getPVFields().size() > 0)
@@ -74,8 +74,23 @@ static PVStructure::shared_pointer getRequestedStructure(
PVFieldPtr pvField = pvStructure->getSubField(*iter);
if (pvField)
{
actualFieldNames.push_back(*iter);
pvFields.push_back(pvField);
PVStructurePtr pvFieldStructure =
std::tr1::dynamic_pointer_cast<PVStructure>(pvField);
PVStructurePtr pvRequestFieldStructure =
std::tr1::dynamic_pointer_cast<PVStructure>(pvRequestFields->getSubField(*iter));
if (pvRequestFieldStructure->getPVFields().size() > 0 && pvFieldStructure.get())
{
// add subfields only
actualFieldNames.push_back(*iter);
pvFields.push_back(getRequestedStructure(pvFieldStructure, pvRequestFieldStructure));
}
else
{
// add entire field
actualFieldNames.push_back(*iter);
pvFields.push_back(pvField);
}
}
}