diff --git a/pvtoolsSrc/eget.cpp b/pvtoolsSrc/eget.cpp index 7c684db..c94ed84 100644 --- a/pvtoolsSrc/eget.cpp +++ b/pvtoolsSrc/eget.cpp @@ -845,15 +845,15 @@ NTFormatterLUTMap ntFormatterLUT; void initializeNTFormatterLUT() { - ntFormatterLUT["uri:ev4:nt/2012/pwd:NTScalar"] = formatNTScalar; - ntFormatterLUT["uri:ev4:nt/2012/pwd:NTScalarArray"] = formatNTScalarArray; - ntFormatterLUT["uri:ev4:nt/2012/pwd:NTEnum"] = formatNTEnum; - ntFormatterLUT["uri:ev4:nt/2012/pwd:NTTable"] = formatNTTable; - ntFormatterLUT["uri:ev4:nt/2012/pwd:NTMatrix"] = formatNTMatrix; - ntFormatterLUT["uri:ev4:nt/2012/pwd:NTAny"] = formatNTAny; - ntFormatterLUT["uri:ev4:nt/2012/pwd:NTNameValue"] = formatNTNameValue; - ntFormatterLUT["uri:ev4:nt/2012/pwd:NTURI"] = formatNTURI; - ntFormatterLUT["uri:ev4:nt/2012/pwd:NTNDArray"] = formatNTNDArray; + ntFormatterLUT["ev4:nt/NTScalar:1.0"] = formatNTScalar; + ntFormatterLUT["ev4:nt/NTScalarArray:1.0"] = formatNTScalarArray; + ntFormatterLUT["ev4:nt/NTEnum:1.0"] = formatNTEnum; + ntFormatterLUT["ev4:nt/NTTable:1.0"] = formatNTTable; + ntFormatterLUT["ev4:nt/NTMatrix:1.0"] = formatNTMatrix; + ntFormatterLUT["ev4:nt/NTAny:1.0"] = formatNTAny; + ntFormatterLUT["ev4:nt/NTNameValue:1.0"] = formatNTNameValue; + ntFormatterLUT["ev4:nt/NTURI:1.0"] = formatNTURI; + ntFormatterLUT["ev4:nt/NTNDArray:1.0"] = formatNTNDArray; } void formatNT(std::ostream& o, PVFieldPtr const & pv) @@ -2044,7 +2044,7 @@ int main (int argc, char *argv[]) Structure::const_shared_pointer uriStructure( getFieldCreate()->createStructure( - "uri:ev4:nt/2012/pwd:NTURI", + "ev4:nt/NTURI:1.0", uriFieldNames, uriFields ) diff --git a/src/server/responseHandlers.cpp b/src/server/responseHandlers.cpp index 19154a0..d713810 100644 --- a/src/server/responseHandlers.cpp +++ b/src/server/responseHandlers.cpp @@ -472,7 +472,7 @@ public: { // NTURI support PVStructure::shared_pointer args( - (arguments->getStructure()->getID() == "uri:ev4:nt/2012/pwd:NTURI") ? + (arguments->getStructure()->getID() == "ev4:nt/NTURI:1.0") ? arguments->getStructureField("query") : arguments ); @@ -521,13 +521,13 @@ public: int32 ServerRPCService::TIMEOUT_SEC = 3; Structure::const_shared_pointer ServerRPCService::helpStructure = getFieldCreate()->createFieldBuilder()-> - setId("uri:ev4:nt/2012/pwd:NTScalar")-> + setId("ev4:nt/NTScalar:1.0")-> add("value", pvString)-> createStructure(); Structure::const_shared_pointer ServerRPCService::channelListStructure = getFieldCreate()->createFieldBuilder()-> - setId("uri:ev4:nt/2012/pwd:NTScalarArray")-> + setId("ev4:nt/NTScalarArray:1.0")-> addArray("value", pvString)-> createStructure(); diff --git a/testApp/remote/rpcServiceExample.cpp b/testApp/remote/rpcServiceExample.cpp index ce18356..66f317f 100644 --- a/testApp/remote/rpcServiceExample.cpp +++ b/testApp/remote/rpcServiceExample.cpp @@ -23,7 +23,7 @@ class SumServiceImpl : { // NTURI support PVStructure::shared_pointer args( - (pvArguments->getStructure()->getID() == "uri:ev4:nt/2012/pwd:NTURI") ? + (pvArguments->getStructure()->getID() == "ev4:nt/NTURI:1.0") ? pvArguments->getStructureField("query") : pvArguments ); @@ -65,4 +65,4 @@ int main() server.run(); return 0; -} \ No newline at end of file +} diff --git a/testApp/remote/rpcWildServiceExample.cpp b/testApp/remote/rpcWildServiceExample.cpp index ef029fb..f541b92 100644 --- a/testApp/remote/rpcWildServiceExample.cpp +++ b/testApp/remote/rpcWildServiceExample.cpp @@ -22,7 +22,7 @@ class WildServiceImpl : throw (RPCRequestException) { // requires NTURI as argument - if (pvArguments->getStructure()->getID() != "uri:ev4:nt/2012/pwd:NTURI") + if (pvArguments->getStructure()->getID() != "ev4:nt/NTURI:1.0") throw RPCRequestException(Status::STATUSTYPE_ERROR, "RPC argument must be a NTURI normative type"); std::string channelName = pvArguments->getSubField("path")->get(); diff --git a/testApp/remote/testNTImage.cpp b/testApp/remote/testNTImage.cpp index 600edfe..87ec186 100644 --- a/testApp/remote/testNTImage.cpp +++ b/testApp/remote/testNTImage.cpp @@ -29,7 +29,7 @@ epics::pvData::StructureConstPtr createNTNDArrayStructure() add("reverse", pvBoolean)-> createStructure(); - StructureConstPtr attributeStruc = fb->setId("uri:ev4:nt/2012/pwd:NTAttribute")-> + StructureConstPtr attributeStruc = fb->setId("ev4:nt/NTAttribute:1.0")-> add("name", pvString)-> add("value", getFieldCreate()->createVariantUnion())-> add("descriptor", pvString)-> @@ -38,7 +38,7 @@ epics::pvData::StructureConstPtr createNTNDArrayStructure() createStructure(); - ntndArrayStructure = fb->setId("uri:ev4:nt/2012/pwd:NTNDArray")-> + ntndArrayStructure = fb->setId("ev4:nt/NTNDArray:1.0")-> add("value", valueType)-> add("codec", codecStruc)-> add("compressedSize", pvLong)-> diff --git a/testApp/remote/testServer.cpp b/testApp/remote/testServer.cpp index 7b0d359..778f28b 100644 --- a/testApp/remote/testServer.cpp +++ b/testApp/remote/testServer.cpp @@ -291,7 +291,7 @@ static epics::pvData::PVStructure::shared_pointer createNTTable(int columnsCount PVStructure::shared_pointer result( getPVDataCreate()->createPVStructure( getFieldCreate()->createStructure( - "uri:ev4:nt/2012/pwd:NTTable", tableFieldNames, tableFields) + "ev4:nt/NTTable:1.0", tableFieldNames, tableFields) ) ); result->getSubField("labels")->replace(freeze(labels)); @@ -329,7 +329,7 @@ static epics::pvData::PVStructure::shared_pointer createNTNameValue(int columnsC PVStructure::shared_pointer result( getPVDataCreate()->createPVStructure( getFieldCreate()->createStructure( - "uri:ev4:nt/2012/pwd:NTNameValue", tableFieldNames, tableFields) + "ev4:nt/NTNameValue:1.0", tableFieldNames, tableFields) ) ); result->getSubField("name")->replace(freeze(labels)); @@ -341,7 +341,7 @@ static epics::pvData::PVStructure::shared_pointer createNTAggregate() { epics::pvData::StructureConstPtr s = getFieldCreate()->createFieldBuilder()-> - setId("uri:ev4:nt/2012/pwd:NTAggregate")-> + setId("ev4:nt/NTAggregate:1.0")-> add("value", pvDouble)-> add("N", pvLong)-> add("dispersion", pvDouble)-> @@ -360,7 +360,7 @@ static epics::pvData::PVStructure::shared_pointer createNTHistogram() { epics::pvData::StructureConstPtr s = getFieldCreate()->createFieldBuilder()-> - setId("uri:ev4:nt/2012/pwd:NTHistogram")-> + setId("ev4:nt/NTHistogram:1.0")-> addArray("ranges", pvDouble)-> addArray("value", pvInt)-> add("timeStamp", getStandardField()->timeStamp())-> @@ -623,23 +623,23 @@ public: { ScopedLock lock(shared_from_this()); - if (m_pvStructure->getStructure()->getID() == "uri:ev4:nt/2012/pwd:NTTable") + if (m_pvStructure->getStructure()->getID() == "ev4:nt/NTTable:1.0") { generateNTTableDoubleValues(m_pvStructure); } - else if (m_pvStructure->getStructure()->getID() == "uri:ev4:nt/2012/pwd:NTNameValue") + else if (m_pvStructure->getStructure()->getID() == "ev4:nt/NTNameValue:1.0") { generateNTNameValueDoubleValues(m_pvStructure); } - else if (m_pvStructure->getStructure()->getID() == "uri:ev4:nt/2012/pwd:NTAggregate") + else if (m_pvStructure->getStructure()->getID() == "ev4:nt/NTAggregate:1.0") { generateNTAggregateValues(m_pvStructure); } - else if (m_pvStructure->getStructure()->getID() == "uri:ev4:nt/2012/pwd:NTHistogram") + else if (m_pvStructure->getStructure()->getID() == "ev4:nt/NTHistogram:1.0") { generateNTHistogramValues(m_pvStructure); } - else if (m_pvStructure->getStructure()->getID() == "uri:ev4:test/2014/binaryCounter") + else if (m_pvStructure->getStructure()->getID() == "ev4:test/binaryCounter:1.0") { PVBytePtr pvByte = static_pointer_cast(m_valueField); int8 val = pvByte->get() + 1; @@ -1199,7 +1199,7 @@ static bool handleHelp( PVStructure::shared_pointer result( getPVDataCreate()->createPVStructure( getFieldCreate()->createStructure( - "uri:ev4:nt/2012/pwd:NTScalar", fieldNames, fields) + "ev4:nt/NTScalar:1.0", fieldNames, fields) ) ); @@ -1257,7 +1257,7 @@ public: if (channelName == "testNTTable") { PVStructure::shared_pointer args( - (pvArgument->getStructure()->getID() == "uri:ev4:nt/2012/pwd:NTURI") ? + (pvArgument->getStructure()->getID() == "ev4:nt/NTURI:1.0") ? pvArgument->getStructureField("query") : pvArgument ); @@ -1287,7 +1287,7 @@ public: else if (channelName == "testNTNameValue") { PVStructure::shared_pointer args( - (pvArgument->getStructure()->getID() == "uri:ev4:nt/2012/pwd:NTURI") ? + (pvArgument->getStructure()->getID() == "ev4:nt/NTURI:1.0") ? pvArgument->getStructureField("query") : pvArgument ); @@ -1329,7 +1329,7 @@ public: PVStructure::shared_pointer result( getPVDataCreate()->createPVStructure( getFieldCreate()->createStructure( - "uri:ev4:nt/2012/pwd:NTNameValue", tableFieldNames, tableFields) + "ev4:nt/NTNameValue:1.0", tableFieldNames, tableFields) ) ); result->getSubField("name")->replace(freeze(labels)); @@ -1346,7 +1346,7 @@ public: else if (channelName == "testNTMatrix") { PVStructure::shared_pointer args( - (pvArgument->getStructure()->getID() == "uri:ev4:nt/2012/pwd:NTURI") ? + (pvArgument->getStructure()->getID() == "ev4:nt/NTURI:1.0") ? pvArgument->getStructureField("query") : pvArgument ); @@ -1382,7 +1382,7 @@ public: PVStructure::shared_pointer result( getPVDataCreate()->createPVStructure( - getFieldCreate()->createStructure("uri:ev4:nt/2012/pwd:NTMatrix", fieldNames, fields) + getFieldCreate()->createStructure("ev4:nt/NTMatrix:1.0", fieldNames, fields) ) ); @@ -1411,7 +1411,7 @@ public: else if (channelName.find("testImage") == 0) { PVStructure::shared_pointer args( - (pvArgument->getStructure()->getID() == "uri:ev4:nt/2012/pwd:NTURI") ? + (pvArgument->getStructure()->getID() == "ev4:nt/NTURI:1.0") ? pvArgument->getStructureField("query") : pvArgument ); @@ -1510,7 +1510,7 @@ public: if (handleHelp(pvArgument, shared_from_this(), m_channelRPCRequester, helpText)) return; - if (pvArgument->getStructure()->getID() != "uri:ev4:nt/2012/pwd:NTURI") + if (pvArgument->getStructure()->getID() != "ev4:nt/NTURI:1.0") { PVStructure::shared_pointer nullPtr; Status errorStatus(Status::STATUSTYPE_ERROR, "argument is not a NTURI structure"); @@ -1525,7 +1525,7 @@ public: else if (channelName == "testSum") { PVStructure::shared_pointer args( - (pvArgument->getStructure()->getID() == "uri:ev4:nt/2012/pwd:NTURI") ? + (pvArgument->getStructure()->getID() == "ev4:nt/NTURI:1.0") ? pvArgument->getStructureField("query") : pvArgument ); @@ -2206,7 +2206,7 @@ protected: m_pvStructure = getPVDataCreate()->createPVStructure( - getFieldCreate()->createStructure("uri:ev4:nt/2012/pwd:NTMatrix", fieldNames, fields) + getFieldCreate()->createStructure("ev4:nt/NTMatrix:1.0", fieldNames, fields) ); // fill with default values @@ -2242,7 +2242,7 @@ protected: { epics::pvData::StructureConstPtr s = getFieldCreate()->createFieldBuilder()-> - setId("uri:ev4:test/2014/binaryCounter")-> + setId("ev4:test/binaryCounter:1.0")-> add("value", pvByte)-> add("bit0", pvBoolean)-> add("bit1", pvBoolean)->