Merge pull request #25 from wanglin86769/add-vtype-to-metadata-of-string

Add vtype to metadata of string PVs
ornl-epics · Jun 17, 2024 · b995613 · b995613
2 parents 4271154 + a179ed8
commit b995613
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/main/java/pvws/ws/Vtype2Json.java b/src/main/java/pvws/ws/Vtype2Json.java
@@ -113,10 +113,20 @@ else if (value != null)
     private static void handleString(final JsonGenerator g, final VString value, final VType last_value) throws Exception
     {
         final AlarmSeverity severity = value.getAlarm().getSeverity();
-        if (last_value == null  ||
-            (last_value instanceof VString  &&
-             ((VString) last_value).getAlarm().getSeverity() != severity))
-            g.writeStringField("severity", value.getAlarm().getSeverity().name());
+        if (last_value == null)
+        {
+            // Initially, add complete metadata
+            g.writeStringField("vtype", VType.typeOf(value).getSimpleName());
+            // Initial severity
+            g.writeStringField("severity", severity.name());
+        }
+        else
+        {
+            // Add severity if it changed
+            if ((last_value instanceof VString) &&
+                 ((VString) last_value).getAlarm().getSeverity() != severity)
+                g.writeStringField("severity", severity.name());
+        }
 
         g.writeStringField("text", value.getValue());
     }