Release/2.8.1

source/plugins/bytes/bytesPlugin.cpp

@@ -135,53 +135,7 @@ int BytesPlugin::help(IDAM_PLUGIN_INTERFACE* plugin_interface)
  */
 int BytesPlugin::version(IDAM_PLUGIN_INTERFACE* plugin_interface)
 {
-    /*
-     * byte encoded version number
-     * b00 00   00 00   00 00   00 00
-     * major.   minor.  patch.  (optional) post-tag commit
-     */
-    std::string version_string = UDA_BUILD_VERSION;
-    unsigned int encoded_version = 0;
-
-    std::regex r("([0-9]+)\\.([0-9]+)\\.([0-9]+)(\\.([0-9]+))?");
-
-    std::smatch r_matches;
-    std::regex_match(version_string, r_matches, r);
-    int bitshift = 24;
-    for (std::size_t i = 1; i < r_matches.size(); ++i)
-    {
-        std::ssub_match sub_match = r_matches[i];
-        std::string token = sub_match.str();
-        if (i !=4 and !token.empty() and bitshift >=0)
-        {
-            encoded_version |= static_cast<unsigned int>(std::stoi(token)) << bitshift;   
-            bitshift -= 8;
-        }
-    }
-
-    // ideally parsed version should always have at least 3 matches. Unexpected version string format or 
-    // problem parsing if fewer matches than this
-    // if (bitshift > 0)
-    // {
-    //     RAISE_PLUGIN_ERROR_AND_EXIT("unexpected plugin version format: expected at least MAJOR.MINOR.PATCH", plugin_interface); 
-    // }
-
-    // no set-return function for unsigned int type
-    DATA_BLOCK* data_block = plugin_interface->data_block;
-    initDataBlock(data_block);
-
-    int* data = (int*)malloc(sizeof(unsigned int));
-    data[0] = encoded_version;
-
-    const char* description = "Byte-encoded plugin version number from MAJOR.MINOR.PATCH.POST string";
-    strncpy(data_block->data_desc, description, STRING_LENGTH);
-    data_block->data_desc[STRING_LENGTH - 1] = '\0';
-
-    data_block->rank = 0;
-    data_block->data_type = UDA_TYPE_UNSIGNED_INT;
-    data_block->data = reinterpret_cast<char*>(data);
-    data_block->data_n = 1;
-    return 0;
+    setReturnDataString(plugin_interface->data_block, UDA_BUILD_VERSION, "Plugin version number");
 }
 
 /**

source/plugins/hdf5/hdf5plugin.cpp

@@ -22,6 +22,7 @@
 
 #include <clientserver/stringUtils.h>
 #include <plugins/managePluginFiles.h>
+#include <version.h>
 
 #include "readHDF58.h"
 
@@ -127,7 +128,7 @@ int do_help(IDAM_PLUGIN_INTERFACE* idam_plugin_interface)
  */
 int do_version(IDAM_PLUGIN_INTERFACE* idam_plugin_interface)
 {
-    return setReturnDataIntScalar(idam_plugin_interface->data_block, THISPLUGIN_VERSION, "Plugin version number");
+    return setReturnDataString(idam_plugin_interface->data_block, UDA_BUILD_VERSION, "Plugin version number");
 }
 
 /**

source/plugins/help/help_plugin.cpp

@@ -17,6 +17,7 @@
 #include <logging/logging.h>
 #include <plugins/udaPlugin.h>
 #include <clientserver/stringUtils.h>
+#include <version.h>
 #include <fmt/format.h>
 
 static int do_ping(IDAM_PLUGIN_INTERFACE* idam_plugin_interface);
@@ -79,7 +80,7 @@ int helpPlugin(IDAM_PLUGIN_INTERFACE* idam_plugin_interface)
                            "servertime()\tReturn the Local Server Time in seconds and microseonds\n\n";
         return setReturnDataString(data_block, help, "Help help = description of this plugin");
     } else if (STR_IEQUALS(request->function, "version")) {
-        return setReturnDataIntScalar(data_block, THISPLUGIN_VERSION, "Plugin version number");
+        return setReturnDataIntScalar(data_block, UDA_BUILD_VERSION, "Plugin version number");
     } else if (STR_IEQUALS(request->function, "builddate")) {
         return setReturnDataString(data_block, __DATE__, "Plugin build date");
     } else if (STR_IEQUALS(request->function, "defaultmethod")) {

source/plugins/keyvalue/keyvaluePlugin.cpp

@@ -6,6 +6,7 @@
 #include <clientserver/initStructs.h>
 #include <clientserver/udaTypes.h>
 #include <plugins/udaPlugin.h>
+#include <version.h>
 
 namespace uda {
 namespace keyvalue {
@@ -170,20 +171,7 @@ int uda::keyvalue::Plugin::help(IDAM_PLUGIN_INTERFACE* plugin_interface)
 
 int uda::keyvalue::Plugin::version(IDAM_PLUGIN_INTERFACE* plugin_interface)
 {
-    DATA_BLOCK* data_block = plugin_interface->data_block;
-
-    initDataBlock(data_block);
-    data_block->data_type = UDA_TYPE_INT;
-    data_block->rank = 0;
-    data_block->data_n = 1;
-    int* data = (int*)malloc(sizeof(int));
-    data[0] = THISPLUGIN_VERSION;
-    data_block->data = (char*)data;
-    strcpy(data_block->data_desc, "Plugin version number");
-    strcpy(data_block->data_label, "version");
-    strcpy(data_block->data_units, "");
-
-    return 0;
+    setReturnDataString(plugin_interface->data_block, UDA_BUILD_VERSION, "Plugin version number");
 }
 
 // Plugin Build Date

source/plugins/template/templatePlugin.cpp

@@ -149,7 +149,7 @@ int TemplatePlugin::help(IDAM_PLUGIN_INTERFACE* idam_plugin_interface)
  */
 int TemplatePlugin::version(IDAM_PLUGIN_INTERFACE* idam_plugin_interface)
 {
-    return setReturnDataIntScalar(idam_plugin_interface->data_block, THISPLUGIN_VERSION, "Plugin version number");
+    return setReturnDatastring(idam_plugin_interface->data_block, UDA_BUILD_VERSION, "Plugin version number");
 }
 
 /**

source/plugins/uda/uda_plugin.cpp

@@ -9,6 +9,7 @@
 #include <logging/logging.h>
 #include <plugins/udaPlugin.h>
 #include <client/udaClient.h>
+#include <version.h>
 #include <fmt/format.h>
 
 #if !defined(__GNUC__)
@@ -140,7 +141,7 @@ int do_help(IDAM_PLUGIN_INTERFACE* idam_plugin_interface)
  */
 int do_version(IDAM_PLUGIN_INTERFACE* idam_plugin_interface)
 {
-    return setReturnDataIntScalar(idam_plugin_interface->data_block, THISPLUGIN_VERSION, "Plugin version number");
+    return setReturnDataString(idam_plugin_interface->data_block, UDA_BUILD_VERSION, "Plugin version number");
 }
 
 /**