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

minor changes

Browse Source
This commit is contained in:
mrkraimer
2019-03-31 07:33:51 -04:00
parent 6d2d63621e
commit 20e55d5bca
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/copy/pvCopy.cpp
View File

@ -464,7 +464,13 @@ StructureConstPtr PVCopy::createStructure(
fields.push_back(field); fields.push_back(field);
} }
size_t numsubfields = fields.size(); size_t numsubfields = fields.size();
if(numsubfields==0) return NULLStructure; if(numsubfields==0) {
std::stringstream ss;
ss << pvFromRequest << "\n";
string val("a requested field was not found in\n");
val += ss.str();
throw std::invalid_argument(val);
}
return getFieldCreate()->createStructure(fieldNames, fields); return getFieldCreate()->createStructure(fieldNames, fields);
} }
@ -500,34 +506,45 @@ CopyNodePtr PVCopy::createStructureNodes(
static_pointer_cast<PVStructure>(copyPVField))); static_pointer_cast<PVStructure>(copyPVField)));
continue; continue;
} }
if(numberRequest!=1) {
string val("requested field ");
val += fieldName + " does not have type structure";
throw std::logic_error(val);
}
if(copyType==epics::pvData::union_) { if(copyType==epics::pvData::union_) {
if(numberRequest!=1) {
std::stringstream ss;
ss << pvFromRequest << "\n";
string val("union field has more than one subfield in\n");
val += ss.str();
throw std::logic_error(val);
}
PVUnionPtr pvUnion = static_pointer_cast<PVUnion>(pvMasterField); PVUnionPtr pvUnion = static_pointer_cast<PVUnion>(pvMasterField);
std::string selectedName = pvUnion->getSelectedFieldName(); std::string selectedName = pvUnion->getSelectedFieldName();
PVFieldPtrArray const & pvFields = requestPVStructure->getPVFields(); PVFieldPtrArray const & pvFields = requestPVStructure->getPVFields();
size_t len = pvFields.size(); size_t len = pvFields.size();
if(len!=1) { if(len!=1) {
string val("field "); std::stringstream ss;
val += fieldName + " logic error on pvdatabase copy"; ss << pvFromRequest << "\n";
throw std::logic_error(val); string val("subfield of union has more than one subfield in\n");
val += ss.str();
throw std::invalid_argument(val);
} }
PVFieldPtr pvRequestValue = pvFields[0]; PVFieldPtr pvRequestValue = pvFields[0];
if(pvRequestValue) { if(pvRequestValue) {
string requestName = pvRequestValue->getFieldName(); string requestName = pvRequestValue->getFieldName();
if(requestName.compare(selectedName)!=0) { if(requestName.compare(selectedName)!=0) {
std::stringstream ss;
ss << pvFromRequest << "\n";
string requestName = pvRequestValue->getFieldName();
string val("field "); string val("field ");
val += requestName + " does not match union type"; val += requestName + " does not match union type in\n";
throw std::logic_error(val); val += ss.str();
throw std::invalid_argument(val);
} }
} }
} else { } else {
std::stringstream ss;
ss << pvFromRequest << "\n";
string val("requested field "); string val("requested field ");
val += fieldName + " does not have type structure"; val += fieldName + " does not have type structure in\n";
throw std::logic_error(val); val += ss.str();
throw std::invalid_argument(val);
} }
} }
CopyNodePtr node(new CopyNode()); CopyNodePtr node(new CopyNode());