Updated DynamicMetadataPublish sample to accept numeric input for the total number of devices to define in the metadata.

Author: ritchiecarroll

src/samples/DynamicMetadataPublish/DynamicMetadataPublish.cpp

@@ -43,19 +43,19 @@ int main(int argc, char* argv[])
     {
         cout << "Usage:" << endl;
         cout << "    InstancePublish PORT [AutoUpdateMetadata?]" << endl;
-    }
-    else
-    {
-        // Get port.
-        stringstream(argv[1]) >> port;
+        return 0;
     }
 
+    // Get port.
+    stringstream(argv[1]) >> port;
+
     if (argc > 2)
         autoUpdateMetadata = ParseBoolean(argv[2]);
     else
-        autoUpdateMetadata = true;
+        autoUpdateMetadata = false;
 
     PublisherHandler* publisher = new PublisherHandler("Publisher");
+    string line;
 
     if (publisher->Start(port, false))
     {
@@ -72,29 +72,28 @@ int main(int argc, char* argv[])
                     publisher->StatusMessage("Metadata update timer stopped: reached configured device limit of " + ToString(MaxDeviceCount) + ".");
                 }
             },
-                true);
+            true);
 
             metadataUpdate.Start();
 
-            string line;
             getline(cin, line);
 
             metadataUpdate.Stop();
         }
         else
         {
-            int key = 0;
+            cout << "At any time, enter the number of devices to define in meta-data and press enter to update meta-data. Type 'exit' and press enter to quit.\r\n\r\n";
 
-            while (key != 10)
+            getline(cin, line);
+
+            while (line != "exit")
             {
-                // Space bar then Enter will update metadata
-                if (key == 32)
-                {
-                    publisher->DefineMetadata(++deviceCount);
-                    getchar();
-                }
+                int32_t devices;
+
+                if (TryParseInt32(line, devices))
+                    publisher->DefineMetadata(devices);
 
-                key = getchar();
+                getline(cin, line);                
             }
         }
     }

src/samples/DynamicMetadataPublish/PublisherHandler.cpp

@@ -85,8 +85,12 @@ void PublisherHandler::DefineMetadata(int32_t devices)
     // these Guid values would need to persist between runs defining a permanent association between the
     // defined metadata and the identifier...
 
+    m_deviceMetadata.clear();
+    m_measurementMetadata.clear();
+    m_phasorMetadata.clear();
+
     // Add device metadata incrementally so that Guids remain consistent for duration of publisher lifetime...
-    for (int32_t i = static_cast<int>(m_deviceMetadata.size()); i < devices; i++)
+    for (int32_t i = 0; i < devices; i++)
     {
         DeviceMetadataPtr device1Metadata = NewSharedPtr<DeviceMetadata>();
         const datetime_t timestamp = UtcNow();
@@ -174,6 +178,8 @@ void PublisherHandler::DefineMetadata(int32_t devices)
 
     // Pass meta-data to publisher instance for proper conditioning
     PublisherInstance::DefineMetadata(m_deviceMetadata, m_measurementMetadata, m_phasorMetadata, m_metadataVersion);
+
+    StatusMessage("Meta-data update complete.");
 }
 
 bool PublisherHandler::Start(uint16_t port, bool ipV6)
@@ -242,13 +248,13 @@ bool PublisherHandler::Start(uint16_t port, bool ipV6)
         // Publish measurements
         PublishMeasurements(measurements);
 
-        // Display a processing message every few seconds
-        const bool showMessage = m_processCount + count >= (m_processCount / interval + 1) * interval && GetTotalMeasurementsSent() > 0;
-        m_processCount += count;
+        //// Display a processing message every few seconds
+        //const bool showMessage = m_processCount + count >= (m_processCount / interval + 1) * interval && GetTotalMeasurementsSent() > 0;
+        //m_processCount += count;
 
 
-        if (showMessage)
-            StatusMessage(ToString(GetTotalMeasurementsSent()) + " measurements published so far...\n");
+        //if (showMessage)
+        //    StatusMessage(ToString(GetTotalMeasurementsSent()) + " measurements published so far...\n");
     },
     true);