Update version numbers for release

Cleanup whitespace

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = pvaClientCPP
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.7.0
+PROJECT_NUMBER         = 4.7.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

configure/CONFIG_PVACLIENT_VERSION

@@ -2,7 +2,7 @@
 
 EPICS_PVACLIENT_MAJOR_VERSION = 4
 EPICS_PVACLIENT_MINOR_VERSION = 7
-EPICS_PVACLIENT_MAINTENANCE_VERSION = 0
+EPICS_PVACLIENT_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions
 

documentation/RELEASE_NOTES.md

@@ -1,7 +1,12 @@
-# pvaClientCPP Module
+pwd# pvaClientCPP Module
 
 This document summarizes the changes to the module between releases.
 
+## Release 4.7.1 (EPICS 7.0.3.2 May 2020)
+
+* support access to a union field that is a scalar or scalarArray
+* fixed issues #62 and #63
+
 ## Release 4.7.0 (EPICS 7.0.3.1, Nov 2019)
 
 * added JSON support for put and putGet

src/pv/pvaClient.h

@@ -36,7 +36,7 @@
 
 #ifdef pvaClientEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
-#	undef pvaClientEpicsExportSharedSymbols
+#   undef pvaClientEpicsExportSharedSymbols
 #endif
 
 #include <shareLib.h>
@@ -713,6 +713,7 @@ public:
     static PvaClientDataPtr create(epics::pvData::StructureConstPtr const & structure);
 protected:
     PvaClientData(epics::pvData::StructureConstPtr const & structure);
+    epics::pvData::PVFieldPtr getSinglePVField();
     void checkValue();
     std::string messagePrefix;
 private:
@@ -1859,4 +1860,3 @@ private:
  * <a href = "../pvaClientCPP.html">pvaClientCPP.html</a>
  *
  */
-

src/pv/pvaClientMultiChannel.h

@@ -21,7 +21,7 @@
 
 #ifdef pvaClientMultiChannelEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
-#	undef pvaClientMultiChannelEpicsExportSharedSymbols
+#   undef pvaClientMultiChannelEpicsExportSharedSymbols
 #endif
 
 
@@ -615,4 +615,3 @@ private:
 }}
 
 #endif  /* PVACLIENTMULTICHANNEL_H */
-

src/pvaClient.cpp

@@ -231,4 +231,3 @@ size_t PvaClient::cacheSize()
 }
 
 }}
- 

src/pvaClientData.cpp

@@ -57,6 +57,30 @@ PvaClientData::PvaClientData(StructureConstPtr const & structure)
 {
 }
 
+PVFieldPtr PvaClientData::getSinglePVField()
+{
+    if(PvaClient::getDebug()) cout << "PvaClientData::getSinglePVField\n";
+    PVStructurePtr pvStructure = getPVStructure();
+    while(true) {
+         const PVFieldPtrArray fieldPtrArray(pvStructure->getPVFields());
+         if(fieldPtrArray.size()==0) {
+              throw std::logic_error("PvaClientData::getSinglePVField() pvRequest for empty structure");
+         }
+         if(fieldPtrArray.size()!=1) {
+              PVFieldPtr pvValue  = pvStructure->getSubField("value");
+              if(pvValue) {
+                  Type type = pvValue->getField()->getType();
+                  if(type!=epics::pvData::structure) return pvValue;
+              }
+              throw std::logic_error("PvaClientData::getSinglePVField() pvRequest for multiple fields");
+         }
+         PVFieldPtr pvField(fieldPtrArray[0]);
+         Type type = pvField->getField()->getType();
+         if(type!=epics::pvData::structure) return pvField;
+         pvStructure = static_pointer_cast<PVStructure>(pvField);
+    }
+}
+
 void PvaClientData::checkValue()
 {
     if(PvaClient::getDebug()) cout << "PvaClientData::checkValue\n";
@@ -180,34 +204,12 @@ PVScalarArrayPtr  PvaClientData::getScalarArrayValue()
 double PvaClientData::getDouble()
 {
     if(PvaClient::getDebug()) cout << "PvaClientData::getDouble\n";
-    PVScalarPtr pvScalar;
+    PVFieldPtr pvField = getSinglePVField();
-    PVStructurePtr pvStructure = getPVStructure();
+    Type type = pvField->getField()->getType();
-    PVFieldPtr pvValue  = pvStructure->getSubField("value");
+    if(type!=scalar) {
-    if(pvValue) {
+        throw std::logic_error("PvaClientData::getDouble() did not find a scalar field");
-        Type type = pvValue->getField()->getType();
-        if(type==scalar) pvScalar = static_pointer_cast<PVScalar>(pvValue);
-    }
-    if(!pvScalar) {
-        while(true) {
-             const PVFieldPtrArray fieldPtrArray(pvStructure->getPVFields());
-             if(fieldPtrArray.size()!=1) {
-                  throw std::logic_error(
-                      "PvaClientData::getDouble() pvRequest for multiple fields");
-             }
-             PVFieldPtr pvField(fieldPtrArray[0]);
-             Type type = pvField->getField()->getType();
-             if(type==scalar) {
-                 pvScalar = static_pointer_cast<PVScalar>(pvField);
-                 break;
-             }
-             if(pvField->getField()->getType()!=epics::pvData::structure) break;
-             pvStructure = static_pointer_cast<PVStructure>(pvField);
-        }
-    }
-    if(!pvScalar) {
-        throw std::logic_error(
-            "PvaClientData::getDouble() did not find a scalar field");
     }
+    PVScalarPtr pvScalar = static_pointer_cast<PVScalar>(pvField);
     ScalarType scalarType = pvScalar->getScalar()->getScalarType();
     if(scalarType==pvDouble) {
         PVDoublePtr pvDouble = static_pointer_cast<PVDouble>(pvScalar);
@@ -223,70 +225,24 @@ double PvaClientData::getDouble()
 string PvaClientData::getString()
 {
     if(PvaClient::getDebug()) cout << "PvaClientData::getString\n";
-    PVScalarPtr pvScalar;
+    PVFieldPtr pvField = getSinglePVField();
-    PVStructurePtr pvStructure = getPVStructure();
+    Type type = pvField->getField()->getType();
-    PVFieldPtr pvValue  = pvStructure->getSubField("value");
+    if(type!=scalar) {
-    if(pvValue) {
+        throw std::logic_error("PvaClientData::getString() did not find a scalar field");
-        Type type = pvValue->getField()->getType();
-        if(type==scalar) pvScalar = static_pointer_cast<PVScalar>(pvValue);
-    }
-    if(!pvScalar) {
-        while(true) {
-             const PVFieldPtrArray fieldPtrArray(pvStructure->getPVFields());
-             if(fieldPtrArray.size()!=1) {
-                  throw std::logic_error(
-                      "PvaClientData::getString() pvRequest for multiple fields");
-             }
-             PVFieldPtr pvField(fieldPtrArray[0]);
-             Type type = pvField->getField()->getType();
-             if(type==scalar) {
-                 pvScalar = static_pointer_cast<PVScalar>(pvField);
-                 break;
-             }
-             if(pvField->getField()->getType()!=epics::pvData::structure) break;
-             pvStructure = static_pointer_cast<PVStructure>(pvField);
-        }
-    }
-    if(!pvScalar) {
-        throw std::logic_error(
-            "PvaClientData::getString() did not find a scalar field");
     }
+    PVScalarPtr pvScalar = static_pointer_cast<PVScalar>(pvField);
     return convert->toString(pvScalar);
 }
 
 shared_vector<const double> PvaClientData::getDoubleArray()
 {
     if(PvaClient::getDebug()) cout << "PvaClientData::getDoubleArray\n";
-    PVScalarArrayPtr pvScalarArray;
+    PVFieldPtr pvField = getSinglePVField();
-    PVStructurePtr pvStructure = getPVStructure();
+    Type type = pvField->getField()->getType();
-    PVFieldPtr pvValue  = pvStructure->getSubField("value");
+    if(type!=scalarArray) {
-    if(pvValue) {
+        throw std::logic_error("PvaClientData::getDoubleArray() did not find a scalarArray field");
-        Type type = pvValue->getField()->getType();
-        if(type==scalarArray) {
-            pvScalarArray = static_pointer_cast<PVScalarArray>(pvValue);
-        }
-    }
-    if(!pvScalarArray) {
-        while(true) {
-             const PVFieldPtrArray fieldPtrArray(pvStructure->getPVFields());
-             if(fieldPtrArray.size()!=1) {
-                  throw std::logic_error(
-                      "PvaClientData::getDoubleArray() pvRequest for multiple fields");
-             }
-             PVFieldPtr pvField(fieldPtrArray[0]);
-             Type type = pvField->getField()->getType();
-             if(type==scalarArray) {
-                 pvScalarArray = static_pointer_cast<PVScalarArray>(pvField);
-                 break;
-             }
-             if(pvField->getField()->getType()!=epics::pvData::structure) break;
-             pvStructure = static_pointer_cast<PVStructure>(pvField);
-        }
-    }
-    if(!pvScalarArray) {
-        throw std::logic_error(
-            "PvaClientData::getDoubleArray() did not find a scalarArray field");
     }
+    PVScalarArrayPtr pvScalarArray = static_pointer_cast<PVScalarArray>(pvField);
     ScalarType scalarType = pvScalarArray->getScalarArray()->getElementType();
     if(!ScalarTypeFunc::isNumeric(scalarType)) {
         throw std::logic_error(
@@ -300,36 +256,12 @@ shared_vector<const double> PvaClientData::getDoubleArray()
 shared_vector<const string> PvaClientData::getStringArray()
 {
     if(PvaClient::getDebug()) cout << "PvaClientData::getStringArray\n";
-    PVScalarArrayPtr pvScalarArray;
+    PVFieldPtr pvField = getSinglePVField();
-    PVStructurePtr pvStructure = getPVStructure();
+    Type type = pvField->getField()->getType();
-    PVFieldPtr pvValue  = pvStructure->getSubField("value");
+    if(type!=scalarArray) {
-    if(pvValue) {
+        throw std::logic_error("PvaClientData::getStringArray() did not find a scalarArray field");
-       Type type = pvValue->getField()->getType();
-        if(type==scalarArray) {
-             pvScalarArray = static_pointer_cast<PVScalarArray>(pvValue);
-        }
-    }
-    if(!pvScalarArray) {
-        while(true) {
-             const PVFieldPtrArray fieldPtrArray(pvStructure->getPVFields());
-             if(fieldPtrArray.size()!=1) {
-                  throw std::logic_error(
-                      "PvaClientData::getStringArray() pvRequest for multiple fields");
-             }
-             PVFieldPtr pvField(fieldPtrArray[0]);
-             Type type = pvField->getField()->getType();
-             if(type==scalarArray) {
-                 pvScalarArray = static_pointer_cast<PVScalarArray>(pvField);
-                 break;
-             }
-             if(pvField->getField()->getType()!=epics::pvData::structure) break;
-             pvStructure = static_pointer_cast<PVStructure>(pvField);
-        }
-    }
-    if(!pvScalarArray) {
-        throw std::logic_error(
-            "PvaClientData::getStringArray() did not find a scalarArray field");
     }
+    PVScalarArrayPtr pvScalarArray = static_pointer_cast<PVScalarArray>(pvField);
     shared_vector<const string> retValue;
     pvScalarArray->getAs<const string>(retValue);
     return retValue;

src/pvaClientMultiChannel.cpp

@@ -80,7 +80,7 @@ Status PvaClientMultiChannel::connect(double timeout)
     Status status = Status::Ok;
     size_t numBad = 0;
     for(size_t i=0; i< numChannel; ++i) {
-	if(numBad==0) {
+        if(numBad==0) {
             status = pvaClientChannelArray[i]->waitConnect(timeout);
         } else {
             status = pvaClientChannelArray[i]->waitConnect(.001);

src/pvaClientPutData.cpp

@@ -74,34 +74,12 @@ PvaClientPutData::PvaClientPutData(StructureConstPtr const & structure)
 void PvaClientPutData::putDouble(double value)
 {
     if(PvaClient::getDebug()) cout << "PvaClientPutData::putDouble\n";
-    PVScalarPtr pvScalar;
+    PVFieldPtr pvField = getSinglePVField();
-    PVStructurePtr pvStructure = getPVStructure();
+    Type type = pvField->getField()->getType();
-    PVFieldPtr pvValue  = pvStructure->getSubField("value");
+    if(type!=scalar) {
-    if(pvValue) {
+        throw std::logic_error("PvaClientData::putDouble() did not find a scalar field");
-        Type type = pvValue->getField()->getType();
-        if(type==scalar) pvScalar = static_pointer_cast<PVScalar>(pvValue);
-    }
-    if(!pvScalar) {
-        while(true) {
-             const PVFieldPtrArray fieldPtrArray(pvStructure->getPVFields());
-             if(fieldPtrArray.size()!=1) {
-                  throw std::logic_error(
-                      "PvaClientData::putDouble() pvRequest for multiple fields");
-             }
-             PVFieldPtr pvField(fieldPtrArray[0]);
-             Type type = pvField->getField()->getType();
-             if(type==scalar) {
-                 pvScalar = static_pointer_cast<PVScalar>(pvField);
-                 break;
-             }
-             if(pvField->getField()->getType()!=epics::pvData::structure) break;
-             pvStructure = static_pointer_cast<PVStructure>(pvField);
-        }
-    }
-    if(!pvScalar) {
-        throw std::logic_error(
-            "PvaClientData::putDouble() did not find a scalar field");
     }
+    PVScalarPtr pvScalar = static_pointer_cast<PVScalar>(pvField);
     ScalarType scalarType = pvScalar->getScalar()->getScalarType();
     if(scalarType==pvDouble) {
         PVDoublePtr pvDouble = static_pointer_cast<PVDouble>(pvScalar);
@@ -118,70 +96,24 @@ void PvaClientPutData::putDouble(double value)
 void PvaClientPutData::putString(std::string const & value)
 {
     if(PvaClient::getDebug()) cout << "PvaClientPutData::putString\n";
-    PVScalarPtr pvScalar;
+    PVFieldPtr pvField = getSinglePVField();
-    PVStructurePtr pvStructure = getPVStructure();
+    Type type = pvField->getField()->getType();
-    PVFieldPtr pvValue  = pvStructure->getSubField("value");
+    if(type!=scalar) {
-    if(pvValue) {
+        throw std::logic_error("PvaClientData::putString() did not find a scalar field");
-        Type type = pvValue->getField()->getType();
-        if(type==scalar) pvScalar = static_pointer_cast<PVScalar>(pvValue);
-    }
-    if(!pvScalar) {
-        while(true) {
-             const PVFieldPtrArray fieldPtrArray(pvStructure->getPVFields());
-             if(fieldPtrArray.size()!=1) {
-                  throw std::logic_error(
-                      "PvaClientData::putString() pvRequest for multiple fields");
-             }
-             PVFieldPtr pvField(fieldPtrArray[0]);
-             Type type = pvField->getField()->getType();
-             if(type==scalar) {
-                 pvScalar = static_pointer_cast<PVScalar>(pvField);
-                 break;
-             }
-             if(pvField->getField()->getType()!=epics::pvData::structure) break;
-             pvStructure = static_pointer_cast<PVStructure>(pvField);
-        }
-    }
-    if(!pvScalar) {
-        throw std::logic_error(
-            "PvaClientData::putString() did not find a scalar field");
     }
+    PVScalarPtr pvScalar = static_pointer_cast<PVScalar>(pvField);
     convert->fromString(pvScalar,value);
 }
 
 void PvaClientPutData::putDoubleArray(shared_vector<const double> const & value)
 {
     if(PvaClient::getDebug()) cout << "PvaClientPutData::putDoubleArray\n";
-    PVScalarArrayPtr pvScalarArray;
+    PVFieldPtr pvField = getSinglePVField();
-    PVStructurePtr pvStructure = getPVStructure();
+    Type type = pvField->getField()->getType();
-    PVFieldPtr pvValue  = pvStructure->getSubField("value");
+    if(type!=scalarArray) {
-    if(pvValue) {
+        throw std::logic_error("PvaClientData::putDoubleArray() did not find a scalarArray field");
-        Type type = pvValue->getField()->getType();
-        if(type==scalarArray) {
-             pvScalarArray = static_pointer_cast<PVScalarArray>(pvValue);
-        }
-    }
-    if(!pvScalarArray) {
-        while(true) {
-             const PVFieldPtrArray fieldPtrArray(pvStructure->getPVFields());
-             if(fieldPtrArray.size()!=1) {
-                  throw std::logic_error(
-                      "PvaClientData::putDoubleArray() pvRequest for multiple fields");
-             }
-             PVFieldPtr pvField(fieldPtrArray[0]);
-             Type type = pvField->getField()->getType();
-             if(type==scalarArray) {
-                 PVScalarArrayPtr pvScalarArray = static_pointer_cast<PVScalarArray>(pvField);
-                 break;
-             }
-             if(pvField->getField()->getType()!=epics::pvData::structure) break;
-             pvStructure = static_pointer_cast<PVStructure>(pvField);
-        }
-    }
-    if(!pvScalarArray) {
-        throw std::logic_error(
-            "PvaClientData::putDoubleArray() did not find a scalarArray field");
     }
+    PVScalarArrayPtr pvScalarArray = static_pointer_cast<PVScalarArray>(pvField);
     ScalarType scalarType = pvScalarArray->getScalarArray()->getElementType();
     if(!ScalarTypeFunc::isNumeric(scalarType)) {
         throw std::logic_error(
@@ -193,36 +125,12 @@ void PvaClientPutData::putDoubleArray(shared_vector<const double> const & value)
 void PvaClientPutData::putStringArray(shared_vector<const std::string> const & value)
 {
     if(PvaClient::getDebug()) cout << "PvaClientPutData::putStringArray\n";
-    PVScalarArrayPtr pvScalarArray;
+    PVFieldPtr pvField = getSinglePVField();
-    PVStructurePtr pvStructure = getPVStructure();
+    Type type = pvField->getField()->getType();
-    PVFieldPtr pvValue  = pvStructure->getSubField("value");
+    if(type!=scalarArray) {
-    if(pvValue) {
+        throw std::logic_error("PvaClientData::putStringArray() did not find a scalarArray field");
-       Type type = pvValue->getField()->getType();
-        if(type==scalarArray) {
-             pvScalarArray = static_pointer_cast<PVScalarArray>(pvValue);
-        }
-    }
-    if(!pvScalarArray) {
-        while(true) {
-             const PVFieldPtrArray fieldPtrArray(pvStructure->getPVFields());
-             if(fieldPtrArray.size()!=1) {
-                  throw std::logic_error(
-                      "PvaClientData::putStringArray() pvRequest for multiple fields");
-             }
-             PVFieldPtr pvField(fieldPtrArray[0]);
-             Type type = pvField->getField()->getType();
-             if(type==scalarArray) {
-                 pvScalarArray = static_pointer_cast<PVScalarArray>(pvField);
-                 break;
-             }
-             if(pvField->getField()->getType()!=epics::pvData::structure) break;
-             pvStructure = static_pointer_cast<PVStructure>(pvField);
-        }
-    }
-    if(!pvScalarArray) {
-        throw std::logic_error(
-            "PvaClientData::putStringArray() did not find a scalarArray field");
     }
+    PVScalarArrayPtr pvScalarArray = static_pointer_cast<PVScalarArray>(pvField);
     pvScalarArray->putFrom<const string>(value);
     return;
 }